Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d72f9471ad
|
|
@ -196,6 +196,7 @@ ADMIN_TOKEN=...copy-paste a unique generated secret token here...
|
|||
ProtectSystem = "strict";
|
||||
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
||||
StateDirectory = "bitwarden_rs";
|
||||
StateDirectoryMode = "0700";
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -311,7 +311,6 @@ in
|
|||
home = "/var/lib/lightdm";
|
||||
group = "lightdm";
|
||||
uid = config.ids.uids.lightdm;
|
||||
shell = pkgs.bash;
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
|
|
|
|||
|
|
@ -879,6 +879,15 @@ let
|
|||
(assertValueOneOf "OnLink" boolValues)
|
||||
];
|
||||
|
||||
sectionIPv6RoutePrefix = checkUnitConfig "IPv6RoutePrefix" [
|
||||
(assertOnlyFields [
|
||||
"Route"
|
||||
"LifetimeSec"
|
||||
])
|
||||
(assertHasField "Route")
|
||||
(assertInt "LifetimeSec")
|
||||
];
|
||||
|
||||
sectionDHCPServerStaticLease = checkUnitConfig "DHCPServerStaticLease" [
|
||||
(assertOnlyFields [
|
||||
"MACAddress"
|
||||
|
|
@ -1242,6 +1251,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ipv6RoutePrefixOptions = {
|
||||
options = {
|
||||
ipv6RoutePrefixConfig = mkOption {
|
||||
default = {};
|
||||
example = { Route = "fd00::/64"; };
|
||||
type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6RoutePrefix;
|
||||
description = ''
|
||||
Each attribute in this set specifies an option in the
|
||||
<literal>[IPv6RoutePrefix]</literal> section of the unit. See
|
||||
<citerefentry><refentrytitle>systemd.network</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
dhcpServerStaticLeaseOptions = {
|
||||
options = {
|
||||
dhcpServerStaticLeaseConfig = mkOption {
|
||||
|
|
@ -1384,6 +1409,17 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
ipv6RoutePrefixes = mkOption {
|
||||
default = [];
|
||||
example = [ { Route = "fd00::/64"; LifetimeSec = 3600; } ];
|
||||
type = with types; listOf (submodule ipv6RoutePrefixOptions);
|
||||
description = ''
|
||||
A list of ipv6RoutePrefix sections to be added to the unit. See
|
||||
<citerefentry><refentrytitle>systemd.network</refentrytitle>
|
||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||
'';
|
||||
};
|
||||
|
||||
name = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
|
|
@ -1775,6 +1811,10 @@ let
|
|||
[IPv6Prefix]
|
||||
${attrsToSection x.ipv6PrefixConfig}
|
||||
'')
|
||||
+ flip concatMapStrings def.ipv6RoutePrefixes (x: ''
|
||||
[IPv6RoutePrefix]
|
||||
${attrsToSection x.ipv6RoutePrefixConfig}
|
||||
'')
|
||||
+ flip concatMapStrings def.dhcpServerStaticLeases (x: ''
|
||||
[DHCPServerStaticLease]
|
||||
${attrsToSection x.dhcpServerStaticLeaseConfig}
|
||||
|
|
|
|||
|
|
@ -11,20 +11,6 @@ in
|
|||
maintainers = [ ] ++ lib.teams.podman.members;
|
||||
};
|
||||
|
||||
|
||||
imports = [
|
||||
(
|
||||
lib.mkRemovedOptionModule
|
||||
[ "virtualisation" "containers" "users" ]
|
||||
"All users with `isNormalUser = true` set now get appropriate subuid/subgid mappings."
|
||||
)
|
||||
(
|
||||
lib.mkRemovedOptionModule
|
||||
[ "virtualisation" "containers" "containersConf" "extraConfig" ]
|
||||
"Use virtualisation.containers.containersConf.settings instead."
|
||||
)
|
||||
];
|
||||
|
||||
options.virtualisation.containers = {
|
||||
|
||||
enable =
|
||||
|
|
|
|||
|
|
@ -11,10 +11,6 @@ let
|
|||
cfgFile = format.generate "00-default.conf" cfg.settings;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "virtualisation" "cri-o" "registries" ] [ "virtualisation" "containers" "registries" "search" ])
|
||||
];
|
||||
|
||||
meta = {
|
||||
maintainers = teams.podman.members;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ in
|
|||
imports = [
|
||||
./dnsname.nix
|
||||
./network-socket.nix
|
||||
(lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ])
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, cmake }:
|
||||
{ lib, stdenv, fetchurl, cmake, removeReferencesTo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.3";
|
||||
|
|
@ -9,13 +9,21 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb";
|
||||
};
|
||||
cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake removeReferencesTo ];
|
||||
|
||||
# It used to reference it, in the past, but thanks to the postFixup hook, now
|
||||
# it doesn't.
|
||||
disallowedReferences = [ stdenv.cc.cc ];
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home";
|
||||
description = "A collection of video game music file emulators";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ luc65r ];
|
||||
maintainers = with maintainers; [ luc65r lheckemann ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strawberry";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonaski";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-TAt/P9nykUtOoHmprFiUJnip8mAnJlvkufD0v9ZWrp4=";
|
||||
hash = "sha256-NhouAHr5fKdH62rtCIHlr8ennixIf9YQrf4zRIGjfxs=";
|
||||
};
|
||||
|
||||
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.6.9";
|
||||
version = "1.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kN+/TQCc35iI8gr9pYlW4B3B6WasGyKQffkJ8rMffVk=";
|
||||
sha256 = "sha256-fy8mIGVij6rjaGEWE6700gbiFnH741hIuvg26W1dBlw=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "erigon";
|
||||
version = "2022.08.02";
|
||||
version = "2022.08.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JXVVfhR7XQKPLpH9F+78+y5hLBGdq/qSA2wniM/sf5s=";
|
||||
sha256 = "sha256-Z+YghJjJfeGO/LuwcLb5A9ghZUcL1OoppMZPsa38ahQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Muksput9s0I9AeQNG+QSbfz0/s14EmSERFg8h0rqaJ8=";
|
||||
vendorSha256 = "sha256-2+9oXLIDYZfWzQfnjwJet4QT01tGzLlQJFjN4ZbG6uw=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
trivialBuild rec {
|
||||
pname = "ebuild-mode";
|
||||
version = "1.55";
|
||||
version = "1.60";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
|
||||
sha256 = "1bs2s5g79vrbk8544lvp388cdbig0s121kwk0h10hif4kp56ka9w";
|
||||
sha256 = "sha256-XN+RLVff4yvxjaAuNjUgSOzU0KdnVGMt9B78rfW389g=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "remarkable-mouse";
|
||||
version = "7.0.2";
|
||||
version = "7.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-R/sQwVt+YHENkG9U2R205+YADovB8P58eMrUD/WnPic=";
|
||||
sha256 = "sha256-e6xJBZmWXAPOHNNUMOGLjbe3QmvW0SRwfMNJVZsM3gw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
rofi-unwrapped.overrideAttrs (oldAttrs: rec {
|
||||
pname = "rofi-wayland-unwrapped";
|
||||
version = "1.7.3+wayland1";
|
||||
version = "1.7.5+wayland1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lbonn";
|
||||
repo = "rofi";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-qvIxWxiQj42VgScSsrF1Yf6ifgEbZes0flNbbwc3O8I=";
|
||||
sha256 = "sha256-ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -3,10 +3,10 @@
|
|||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "104.0";
|
||||
version = "104.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "8778650ffa3c2d18802c348e27789f00cff143c7ca0ae01b1bcd050b6942c149db25696b48f3c702fbde901c15fcae976ac731a456f641637cae3eb56d0077d3";
|
||||
sha512 = "ad80fccfde34a201fc4b596c2a0a1d959abc132946dde0865b6da624a07fd9c57381bc268c394a17f295e0e183d122b2cf5c5126e8a0bc99684affaa6212e246";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "driftctl";
|
||||
version = "0.34.1";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snyk";
|
||||
repo = "driftctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/tdAmu/BurCFB82i9pT2+PNOsPtHdlL/brUt4B9Q/EA=";
|
||||
sha256 = "sha256-Abp5JetsMqIXZK8BxNa22OBFCxquoLoy3npv6XxCWGo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KChEDFZj5zsZ/viOVWgC15WI8mp5cUC+SdNwkCjo6bI=";
|
||||
vendorSha256 = "sha256-uWPnBqT6lZSRClw2RyxHEOzue1Azj9VpPaulMA3qlug=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -16,15 +16,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
inherit pname ;
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
tags = lib.optionals enableGateway ["gateway"];
|
||||
vendorSha256 = "sha256-0YmWmGuzyES7BoHKWxzF2K1rDW7PO2DRdNmY3eJkUAM=";
|
||||
vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kumahq";
|
||||
repo = "kuma";
|
||||
rev = version;
|
||||
sha256 = "sha256-U8fWDXJ0ztod6r0qz63jbgYA06ItxA76BjSliniYnIQ=";
|
||||
sha256 = "sha256-5459Fl7AbzuNGIOfDpVYlhvzLzfLT2Ckhr5omxZr76w=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@ with pythonPackages;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "rss2email";
|
||||
version = "3.13.1";
|
||||
version = "3.14";
|
||||
|
||||
propagatedBuildInputs = [ feedparser html2text ];
|
||||
checkInputs = [ beautifulsoup4 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
|
||||
sha256 = "3994444766874bb35c9f886da76f3b24be1cb7bbaf40fad12b16f2af80ac1296";
|
||||
sha256 = "sha256-RwORS2PHquxBZLNKqCJtR5XX4SHqPCb/Fn+Y68dfI/g=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocketchat-desktop";
|
||||
version = "3.8.7";
|
||||
version = "3.8.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
|
||||
sha256 = "sha256-kSEOjhsSa+5+oNxWY+cQR7RIRzd+BGR4WDL1drybxzU=";
|
||||
sha256 = "sha256-8bbIJNbx3G46YX06I0K74a8VPNCHjn7I4R6Za+s+PRA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
"0cwplzza8vv4nzxf35i2p4gfnna4dpgp0ddqbpdxl8cxrikq5rji"
|
||||
|
|
@ -1 +0,0 @@
|
|||
"5.11.1.8356"
|
||||
|
|
@ -44,24 +44,26 @@ let
|
|||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
# Zoom versions are released at different times for each platform
|
||||
version = {
|
||||
aarch64-darwin =import ./arm64-darwin-version.nix;
|
||||
x86_64-darwin = import ./x86_64-darwin-version.nix;
|
||||
x86_64-linux = import ./x86_64-linux-version.nix;
|
||||
}.${system} or throwSystem;
|
||||
# and often with different versions. We write them on three lines
|
||||
# like this (rather than using {}) so that the updater script can
|
||||
# find where to edit them.
|
||||
versions.aarch64-darwin = "5.11.9.10046";
|
||||
versions.x86_64-darwin = "5.11.9.10046";
|
||||
versions.x86_64-linux = "5.11.10.4400";
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64";
|
||||
sha256 = import ./arm64-darwin-sha.nix;
|
||||
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
|
||||
name = "zoomusInstallerFull.pkg";
|
||||
hash = "sha256-Z+K811azMRnhptZ1UvM+o5IgE0F4p9BrntJC9IgPU7U=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/Zoom.pkg";
|
||||
sha256 = import ./x86_64-darwin-sha.nix;
|
||||
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
|
||||
hash = "sha256-7U7qT3xlm5LqcJByMWxhZnqs6XBzylEGhqTNUgiaXJY=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
sha256 = import ./x86_64-linux-sha.nix;
|
||||
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-Pi1MtuCHzkQACamsNOIS6pbM03L1CmyosbpdrYVNCkQ=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -109,7 +111,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zoom";
|
||||
inherit version;
|
||||
version = versions.${system} or throwSystem;
|
||||
|
||||
src = srcs.${system} or throwSystem;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +1,34 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl pup
|
||||
#!nix-shell -i bash -p common-updater-scripts curl jq
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
dirname="$(dirname "$0")"
|
||||
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
|
||||
nixpkgs=$(realpath "$scriptDir"/../../../../..)
|
||||
|
||||
uname="$(uname)"
|
||||
echo >&2 "=== Obtaining version data from https://zoom.us/rest/download ..."
|
||||
linux_data=$(curl -Ls 'https://zoom.us/rest/download?os=linux' | jq .result.downloadVO)
|
||||
mac_data=$(curl -Ls 'https://zoom.us/rest/download?os=mac' | jq .result.downloadVO)
|
||||
|
||||
if [[ "$uname" == "Linux" ]]; then
|
||||
version="$(curl -Ls https://zoom.us/download\?os\=linux | \
|
||||
pup '.linux-ver-text text{}' | \
|
||||
awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
|
||||
printf '"%s"\n' ${version} > $dirname/x86_64-linux-version.nix
|
||||
printf '"%s"\n' \
|
||||
$(nix-prefetch-url https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz) > \
|
||||
$dirname/x86_64-linux-sha.nix
|
||||
elif [[ $uname == "Darwin" ]]; then
|
||||
# The 1st line might be empty
|
||||
# 2nd line is the version of the conference room application
|
||||
version="$(curl -Ls https://zoom.us/download\?os\=mac | \
|
||||
pup '.ver text{}' | \
|
||||
sed '/^$/d' |\
|
||||
head -1 | \
|
||||
awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
|
||||
printf '"%s"\n' ${version} > "$dirname/$(uname -m)-darwin-version.nix"
|
||||
printf '"%s"\n' \
|
||||
$(nix-prefetch-url "https://zoom.us/client/${version}/Zoom.pkg?archType=$(uname -m)") > \
|
||||
"$dirname/$(uname -m)-darwin-sha.nix"
|
||||
fi
|
||||
version_aarch64_darwin=$(jq -r .zoomArm64.version <<<"$mac_data")
|
||||
version_x86_64_darwin=$(jq -r .zoom.version <<<"$mac_data")
|
||||
version_x86_64_linux=$(jq -r .zoom.version <<<"$linux_data")
|
||||
|
||||
echo >&2 "=== Downloading packages and computing hashes..."
|
||||
# We precalculate the hashes before calling update-source-version
|
||||
# because it attempts to calculate each architecture's package's hash
|
||||
# by running `nix-build --system <architecture> -A zoom-us.src` which
|
||||
# causes cross compiling headaches; using nix-prefetch-url with
|
||||
# hard-coded URLs is simpler. Keep these URLs in sync with the ones
|
||||
# in default.nix where `srcs` is defined.
|
||||
hash_aarch64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64"))
|
||||
hash_x86_64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg"))
|
||||
hash_x86_64_linux=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz"))
|
||||
|
||||
echo >&2 "=== Updating default.nix ..."
|
||||
# update-source-version expects to be at the root of nixpkgs
|
||||
(cd "$nixpkgs" && update-source-version zoom-us "$version_aarch64_darwin" $hash_aarch64_darwin --system=aarch64-darwin --version-key=versions.aarch64-darwin)
|
||||
(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_darwin" $hash_x86_64_darwin --system=x86_64-darwin --version-key=versions.x86_64-darwin)
|
||||
(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_linux" $hash_x86_64_linux --system=x86_64-linux --version-key=versions.x86_64-linux)
|
||||
|
||||
echo >&2 "=== Done!"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
"12s4z80n1qk1vcp5vppabj6fxanm4q7pjj7mggalmjbj6984fsza"
|
||||
|
|
@ -1 +0,0 @@
|
|||
"5.11.1.8356"
|
||||
|
|
@ -1 +0,0 @@
|
|||
"09x0l50frck8v2zhgp84m57q3kj74chk37sc69mpbhwy0s6vg980"
|
||||
|
|
@ -1 +0,0 @@
|
|||
"5.11.3.3882"
|
||||
|
|
@ -13,6 +13,10 @@
|
|||
, hamlib
|
||||
, wxGTK31-gtk3
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux
|
||||
, AppKit
|
||||
, AVFoundation
|
||||
, Cocoa
|
||||
, CoreMedia
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -26,7 +30,15 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-LPCY5gPinxJkfPfumKggI/JQorcW+Qw/ZAP6XQmPkeA=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace "if(APPLE)" "if(0)" \
|
||||
--replace "\''${FREEDV_LINK_LIBS})" "\''${FREEDV_LINK_LIBS} \''${FREEDV_LINK_LIBS_OSX})" \
|
||||
--replace "\''${RES_FILES})" "\''${RES_FILES} \''${FREEDV_SOURCES_OSX})"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
codec2
|
||||
libsamplerate
|
||||
|
|
@ -35,7 +47,13 @@ stdenv.mkDerivation rec {
|
|||
speexdsp
|
||||
hamlib
|
||||
wxGTK31-gtk3
|
||||
] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]);
|
||||
] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ])
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
AVFoundation
|
||||
Cocoa
|
||||
CoreMedia
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_INTERNAL_CODEC2:BOOL=FALSE"
|
||||
|
|
@ -46,8 +64,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://freedv.org/";
|
||||
description = "Digital voice for HF radio";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ mvs ];
|
||||
maintainers = with maintainers; [ mvs wegank ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/issues/165422
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-remote-gcrypt";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
rev = version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "spwhitton";
|
||||
repo = "git-remote-gcrypt";
|
||||
sha256 = "sha256-uHgz8Aj5w8UOo/XbptCRKON1RAdDfFsLL9ZDEF1QrPQ=";
|
||||
sha256 = "sha256-uy6s3YQwY/aZmQoW/qe1YrSlfNHyDTXBFxB6fPGiPNQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.24.2";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7nQI6zaWSWML2suPn1A+RJZ0iPJu6JD/4ion5zxlnJ8=";
|
||||
sha256 = "sha256-3J/fiaJL828P0L0vgwcR3DbMASt3fcwnLBu33SFDlx0=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whitesur-gtk-theme";
|
||||
version = "2022-02-21";
|
||||
version = "2022-08-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1bqgbkx7qhpj9vbqcxb69p67m8ix3avxr81pdpdi56g9gqbnkpfc";
|
||||
sha256 = "sha256-kvu6Zv5vmyDasBt6eOBqexv0n5vi6OzpG5We1eSbW0o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgme";
|
||||
version = "0.6.3";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A collection of video game music chip emulators";
|
||||
homepage = "https://bitbucket.org/mpyne/game-music-emu/overview";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ lheckemann ];
|
||||
};
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "mpyne";
|
||||
repo = "game-music-emu";
|
||||
rev = version;
|
||||
sha256 = "100ahb4n4pvgcry9xzlf2fr4j57n5h9x7pvyhhxys4dcy8axqqsy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake removeReferencesTo ];
|
||||
|
||||
# These checks fail on aarch64-darwin
|
||||
cmakeFlags = [ "-DENABLE_UBSAN=OFF" ];
|
||||
|
||||
# It used to reference it, in the past, but thanks to the postFixup hook, now
|
||||
# it doesn't.
|
||||
disallowedReferences = [ stdenv.cc.cc ];
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)"
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cmark-gfm";
|
||||
version = "0.29.0.gfm.4";
|
||||
version = "0.29.0.gfm.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "cmark-gfm";
|
||||
rev = version;
|
||||
sha256 = "sha256-touFLrxVQvX75JXYLADq84yIuQ1kl43fVUvZ4qGYoMM=";
|
||||
sha256 = "sha256-HNFxp62xBNo2GbWiiYXco2NMgoOXsnZNdbXgTK1i1JU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
, libGLU
|
||||
, libGL
|
||||
, libintl
|
||||
, libgme
|
||||
, game-music-emu
|
||||
, openssl
|
||||
, x265
|
||||
, libxml2
|
||||
|
|
@ -164,7 +164,7 @@ stdenv.mkDerivation rec {
|
|||
gnutls
|
||||
libGL
|
||||
libGLU
|
||||
libgme
|
||||
game-music-emu
|
||||
openssl
|
||||
libxml2
|
||||
libintl
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seasocks";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattgodbolt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1f9a3mx3yjmr5qry4rc1c7mrx3348iifxm7d8sj8yd41kqnzmfv4";
|
||||
sha256 = "sha256-b1KNHuS5ndkBWItKVTiJ//Y+uKi1PcUk9624IILOusQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asysocks";
|
||||
version = "0.1.7";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-I9X8+ucadYJsPteHvZsbw7GJ7DdliWG86DyemUVeNUw=";
|
||||
sha256 = "sha256-1mrXgwWI1XGmN3J9HJBktHFowIEU+RPt9L6S4ylHTzw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipydatawidgets";
|
||||
version = "4.3.1.post1";
|
||||
version = "4.3.2";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-aYGrzNmmupSuf2FuGBqabaPrFUM+VrtfFAQeXBEaJR8=";
|
||||
sha256 = "sha256-LyuZf2Vp0+4fT3412wyx2gjAd7IaiPHAHFn1uYajGqY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,25 +1,52 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, PyGithub, GitPython, toml, click, tqdm,
|
||||
networkx, pydot, pyyaml, atomicwrites }:
|
||||
{ lib
|
||||
, atomicwrites
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, fetchPypi
|
||||
, GitPython
|
||||
, networkx
|
||||
, pydot
|
||||
, PyGithub
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, toml
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mathlibtools";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-0iW7SWIxb+Ek4T26hru5EgBgXfqRh6zOR73GAgLFNyE=";
|
||||
hash = "sha256-Jbnb3FKyB1NAehB8tZxBV6d7JJCOgWZPMWMaFEAOzkM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
PyGithub GitPython toml click tqdm networkx pydot pyyaml atomicwrites
|
||||
atomicwrites
|
||||
click
|
||||
GitPython
|
||||
networkx
|
||||
pydot
|
||||
PyGithub
|
||||
pyyaml
|
||||
toml
|
||||
tqdm
|
||||
];
|
||||
|
||||
# requires internet access
|
||||
# Requires internet access
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mathlibtools"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Supporting tool for Lean's mathlib";
|
||||
homepage = "https://github.com/leanprover-community/mathlib-tools";
|
||||
description = "leanproject is a supporting tool for Lean's mathlib";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
};
|
||||
|
|
|
|||
59
pkgs/development/python-modules/picobox/default.nix
Normal file
59
pkgs/development/python-modules/picobox/default.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, flask
|
||||
, isPy27
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "picobox";
|
||||
version = "2.2.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikalnytskyi";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-B2A8GMhBFU/mb/JiiqtP+HvpPj5FYwaYO3gQN2QI6z0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# already in master, but no new release yet.
|
||||
# https://github.com/ikalnytskyi/picobox/issues/55
|
||||
url = "https://github.com/ikalnytskyi/picobox/commit/1fcc4a0c26a7cd50ee3ef6694139177b5dfb2be0.patch";
|
||||
hash = "sha256-/NIEzTFlZ5wG7jHT/YdySYoxT/UhSk29Up9/VqjG/jg=";
|
||||
includes = [
|
||||
"tests/test_box.py"
|
||||
"tests/test_stack.py"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
flask
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"picobox"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Opinionated dependency injection framework";
|
||||
homepage = "https://github.com/ikalnytskyi/picobox";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybase64";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-vv2YOlp7ZVE1W2q+VnI/f58SxYDgLxJreIOwdb6/8lw=";
|
||||
sha256 = "sha256-dtB035p7mJs1iZJqsZRmd7uzmez+IwcUsTFX4mM2Ee0=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sensor-state-data";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xAsyM33so+oKCX3yQPpmEWT0QdxfLLQt3eYCkfphsF8=";
|
||||
hash = "sha256-qu8dP0HAu6szL/GwfX6ar3P0No5HDBbULNWdjLaiLwc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
41
pkgs/development/python-modules/sphinx-mdinclude/default.nix
Normal file
41
pkgs/development/python-modules/sphinx-mdinclude/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, flit-core
|
||||
, docutils
|
||||
, mistune
|
||||
, pygments
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-mdinclude";
|
||||
version = "0.5.2";
|
||||
format = "flit";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "sphinx_mdinclude";
|
||||
inherit version;
|
||||
hash = "sha256-F7UVe1xNrz+vCbJOCxwyJQoxfwSCORW+qu9vDH7oEPc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
propagatedBuildInputs = [ mistune docutils ];
|
||||
|
||||
checkInputs = [ pygments ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/miyakogi/m2r";
|
||||
description = "Sphinx extension for including or writing pages in Markdown format.";
|
||||
longDescription = ''
|
||||
A simple Sphinx extension that enables including Markdown documents from within
|
||||
reStructuredText.
|
||||
It provides the .. mdinclude:: directive, and automatically converts the content of
|
||||
Markdown documents to reStructuredText format.
|
||||
|
||||
sphinx-mdinclude is a fork of m2r and m2r2, focused only on providing a Sphinx extension.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,26 +1,46 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, deepmerge
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, isPy27
|
||||
, setuptools-scm
|
||||
, m2r
|
||||
, pyyaml
|
||||
, jsonschema
|
||||
, picobox
|
||||
, pyyaml
|
||||
, sphinx-mdinclude
|
||||
, sphinxcontrib_httpdomain
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-openapi";
|
||||
version = "0.7.0";
|
||||
version = "unstable-2022-08-26";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1c1bd10d7653912c59a42f727c62cbb7b75f7905ddd9ccc477ebfd1bc69f0cf3";
|
||||
# Switch to Cilums' fork of openapi, which uses m2r instead of mdinclude,
|
||||
# as m2r is unmaintained and incompatible with the version of mistune.
|
||||
# See
|
||||
# https://github.com/cilium/cilium/commit/b9862461568dd41d4dc8924711d4cc363907270b and
|
||||
# https://github.com/cilium/openapi/commit/cd829a05caebd90b31e325d4c9c2714b459d135f
|
||||
# for details.
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = "openapi";
|
||||
rev = "0ea3332fa6482114f1a8248a32a1eacb61aebb69";
|
||||
hash = "sha256-a/oVMg9gGTD+NClfpC2SpjbY/mIcZEVLLOR0muAg5zY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ pyyaml jsonschema m2r sphinxcontrib_httpdomain ];
|
||||
propagatedBuildInputs = [
|
||||
deepmerge
|
||||
jsonschema
|
||||
picobox
|
||||
pyyaml
|
||||
sphinx-mdinclude
|
||||
sphinxcontrib_httpdomain
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -29,5 +49,4 @@ buildPythonPackage rec {
|
|||
description = "OpenAPI (fka Swagger) spec renderer for Sphinx";
|
||||
license = licenses.bsd0;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlite-utils";
|
||||
version = "3.28";
|
||||
version = "3.29";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eQsB9L4WwydWubXq4HtrfJBbZhPKU41kaHfFCwWwpTo=";
|
||||
hash = "sha256-2eoQJqnAB6iVzdBKvcvjzSrANRXCouu62SM5OaoRH1s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "railway";
|
||||
version = "2.0.8";
|
||||
version = "2.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E6DCY+xM796pQb48xkVQ6d3qgIB528hbCU96SCu2eYI=";
|
||||
sha256 = "sha256-g/QBsWWVjhmn5slNav7j+vrzwf/0mMAERJaDLRrbxGI=";
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kore";
|
||||
version = "4.2.2";
|
||||
version = "4.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorisvink";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-B1Fm02EHkV4mogz4PrqdZWvRQ8ixO+sRhvqW7ObzJjY=";
|
||||
sha256 = "sha256-p0M2P02xwww5EnT28VnEtj5b+/jkPW3YkJMuK79vp4k=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl curl postgresql yajl ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, nasm
|
||||
, libopenmpt
|
||||
, p7zip
|
||||
, libgme
|
||||
, game-music-emu
|
||||
, libpng
|
||||
, SDL2
|
||||
, SDL2_mixer
|
||||
|
|
@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
curl
|
||||
libgme
|
||||
game-music-emu
|
||||
libpng
|
||||
libopenmpt
|
||||
SDL2
|
||||
|
|
@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
"-DSRB2_ASSET_DIRECTORY=/build/source/assets"
|
||||
"-DGME_INCLUDE_DIR=${libgme}/include"
|
||||
"-DGME_INCLUDE_DIR=${game-music-emu}/include"
|
||||
"-DOPENMPT_INCLUDE_DIR=${libopenmpt.dev}/include"
|
||||
"-DSDL2_MIXER_INCLUDE_DIR=${SDL2_mixer}/include/SDL2"
|
||||
"-DSDL2_INCLUDE_DIR=${SDL2.dev}/include/SDL2"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, curl
|
||||
, nasm
|
||||
, unzip
|
||||
, libgme
|
||||
, game-music-emu
|
||||
, libpng
|
||||
, SDL2
|
||||
, SDL2_mixer
|
||||
|
|
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
curl
|
||||
libgme
|
||||
game-music-emu
|
||||
libpng
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
|
|
@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
#"-DSRB2_ASSET_DIRECTORY=/build/source/assets"
|
||||
"-DGME_INCLUDE_DIR=${libgme}/include"
|
||||
"-DGME_INCLUDE_DIR=${game-music-emu}/include"
|
||||
"-DSDL2_MIXER_INCLUDE_DIR=${SDL2_mixer}/include/SDL2"
|
||||
"-DSDL2_INCLUDE_DIR=${SDL2.dev}/include/SDL2"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchhg, cmake, pkg-config, makeWrapper, callPackage
|
||||
, soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, libgme
|
||||
, soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, game-music-emu
|
||||
, serverOnly ? false
|
||||
}:
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
# I have no idea why would SDL and libjpeg be needed for the server part!
|
||||
# But they are.
|
||||
buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite libgme ]
|
||||
buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite game-music-emu ]
|
||||
++ lib.optionals (!serverOnly) [ libGL glew fmod fluidsynth gtk2 ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper python3 ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rtl8189es-${kernel.version}-${version}";
|
||||
version = "2021-10-01";
|
||||
version = "2022-05-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwrdegoede";
|
||||
repo = "rtl8189ES_linux";
|
||||
rev = "be378f47055da1bae42ff6ec1d62f1a5052ef097";
|
||||
sha256 = "sha256-+19q1Xux2BjquavY+s0UDzTubEt6BEUZ9XVDVmj36us=";
|
||||
rev = "1269e117454069cd47f1822ffa31e29ec19a10da";
|
||||
sha256 = "sha256-3d16zu9RxPKO9uAjHNu/+9z++smH1LSXHmrB0FnQt+E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies;
|
||||
|
|
@ -42,6 +42,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ danielfullmer lheckemann ];
|
||||
broken = kernel.kernelAtLeast "5.17";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "thanos";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "thanos-io";
|
||||
repo = "thanos";
|
||||
sha256 = "sha256-QE096mJRRnO86AeA1COgi8gSWwIczefFP7j7V+lx/t4=";
|
||||
sha256 = "sha256-h6HDwPbFflF9vZu3s7cMPOQ9iPNPcuDK/1UAX1fSePE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BXLndaLR/A4FIgSXgQZlMzVdDAiDMXa8VkuZakiq/5M=";
|
||||
vendorSha256 = "sha256-EOVxhmR4bkTlxJ/ozl0zmik0+vqmeWBI1IrL2Hf5MU8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,17 +5,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.31.2";
|
||||
version = "0.31.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4QNnZHFPyAAQOGRKse4cCc34FgMpelHj+MFTuHLUodE=";
|
||||
sha256 = "sha256-e+H5FH9UU2zK4GmxN04T87GdZYRZDVtA0FNw6t4kjgQ=";
|
||||
};
|
||||
# hash missmatch on across linux and darwin
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-Kc7M0wetqAfjoosUYW7v0ZLJ7bb/4z6gG6G83D072Dc=";
|
||||
vendorSha256 = "sha256-QjJHmVqZTw5w1jR+EctS4VzeJMBpkCL3VGjeKeQmyPA=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2022.08.01";
|
||||
version = "2022.08.23";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-qFk/Rij7P17ZlJFjsrW8snp2anCGjqxfytzopIyHLL0=";
|
||||
hash = "sha256-YVi8c5c8lYpctXmOp478hVRp3wXegNxfBcrB0fTvBxE=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -40,13 +40,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpm-ostree";
|
||||
version = "2022.12";
|
||||
version = "2022.13";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-kl9TwrvrIdF/R4NIVXUP2WYDflwB6BE+0j9Rum9jTXY=";
|
||||
sha256 = "sha256-3lU+Xmfyjs6AFnf+vE5xMSAntRoNeHBVrOJZLvv1YyY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ttchat";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atye";
|
||||
repo = "ttchat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Km8aBThs2h8vVpQQaN/OuDeQcrewhP0hMMRuU8/1Ilk=";
|
||||
sha256 = "sha256-+fPARVS1ILxrigHpvb+iNqz7Xw7+c/LmHJEeRxhCbhQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pJAwx7RmD2sSHsz1DxtsU7bjC/b0JujlrFeGL6zmTiI=";
|
||||
vendorSha256 = "sha256-XWCjnHg0P7FCuiMjCV6ijy60h0u776GyiIC/k/KMW38=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Connect to a Twitch channel's chat from your terminal";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, buildGoModule
|
||||
, makeWrapper
|
||||
, fetchFromGitHub
|
||||
|
|
@ -18,18 +19,29 @@ let
|
|||
owner = "DataDog";
|
||||
repo = "datadog-agent";
|
||||
goPackagePath = "github.com/${owner}/${repo}";
|
||||
|
||||
in buildGoModule rec {
|
||||
pname = "datadog-agent";
|
||||
version = "7.36.0";
|
||||
version = "7.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = version;
|
||||
sha256 = "sha256-pkbgYE58T9QzV7nCzvfBoTt6Ue8cCMUBSuCBeDtdkzo=";
|
||||
sha256 = "sha256-bG8wsSQvZcG4/Th6mWVdVX9vpeYBZx8FxwdYXpIdXnU=";
|
||||
};
|
||||
rtloader = stdenv.mkDerivation {
|
||||
pname = "datadog-agent-rtloader";
|
||||
src = "${src}/rtloader";
|
||||
inherit version;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ python ];
|
||||
cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"];
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-SxdSoZtRAdl3evCpb+3BHWf/uPYJJKgw0CL9scwNfGA=";
|
||||
in buildGoModule rec {
|
||||
pname = "datadog-agent";
|
||||
inherit src version;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
vendorSha256 = "sha256-bGDf48wFa32hURZfGN5pCMmslC3PeLNayKcl5cfjq9M=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/agent"
|
||||
|
|
@ -41,12 +53,12 @@ in buildGoModule rec {
|
|||
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = lib.optionals withSystemd [ systemd ];
|
||||
buildInputs = [rtloader] ++ lib.optionals withSystemd [ systemd ];
|
||||
PKG_CONFIG_PATH = "${python}/lib/pkgconfig";
|
||||
|
||||
tags = [
|
||||
"ec2"
|
||||
"cpython"
|
||||
"python"
|
||||
"process"
|
||||
"log"
|
||||
"secrets"
|
||||
|
|
@ -58,7 +70,8 @@ in buildGoModule rec {
|
|||
"-X ${goPackagePath}/pkg/version.Commit=${src.rev}"
|
||||
"-X ${goPackagePath}/pkg/version.AgentVersion=${version}"
|
||||
"-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}"
|
||||
"-X ${goPackagePath}/pkg/collector/py.pythonHome=${python}"
|
||||
"-X ${goPackagePath}/pkg/collector/python.pythonHome3=${python}"
|
||||
"-X ${goPackagePath}/pkg/config.DefaultPython=3"
|
||||
"-r ${python}/lib"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -42,20 +42,15 @@ let
|
|||
owner = "DataDog";
|
||||
repo = "integrations-core";
|
||||
rev = version;
|
||||
sha256 = "0424zsnf747s10kfzv5y0m0ac9sgczip78yvghhrc2i089i5z2h4";
|
||||
sha256 = "sha256-CIzuJ97KwsG1k65Y+8IUSka/3JX1pmQKN3hPHzZnGhQ=";
|
||||
};
|
||||
version = "7.30.1";
|
||||
version = "7.38.0";
|
||||
|
||||
# Build helper to build a single datadog integration package.
|
||||
buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // {
|
||||
inherit src version;
|
||||
name = "datadog-integration-${pname}-${version}";
|
||||
|
||||
postPatch = ''
|
||||
# jailbreak install_requires
|
||||
sed -i 's/==.*//' requirements.in
|
||||
cp requirements.in requirements.txt
|
||||
'';
|
||||
sourceRoot = "source/${args.sourceRoot or pname}";
|
||||
doCheck = false;
|
||||
});
|
||||
|
|
@ -65,7 +60,21 @@ let
|
|||
pname = "checks-base";
|
||||
sourceRoot = "datadog_checks_base";
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
requests protobuf prometheus-client simplejson uptime
|
||||
cachetools
|
||||
cryptography
|
||||
immutables
|
||||
jellyfish
|
||||
prometheus-client
|
||||
protobuf
|
||||
pydantic
|
||||
python-dateutil
|
||||
pyyaml
|
||||
requests
|
||||
requests-toolbelt
|
||||
requests-unixsocket
|
||||
simplejson
|
||||
uptime
|
||||
wrapt
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -75,8 +84,8 @@ let
|
|||
mongo = (ps: [ ps.pymongo ]);
|
||||
network = (ps: [ ps.psutil ]);
|
||||
nginx = (ps: []);
|
||||
postgres = (ps: with ps; [ pg8000 psycopg2 ]);
|
||||
process = (ps: []);
|
||||
postgres = (ps: with ps; [ pg8000 psycopg2 semver ]);
|
||||
process = (ps: [ ps.psutil]);
|
||||
};
|
||||
|
||||
# All integrations (default + extra):
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "sish";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoniomika";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-phnPs9mpheIOP0uZZ1Uoo7oRXl09Z+0q54v16YUYNUc=";
|
||||
sha256 = "sha256-Gk6hUv6SKZ71iJdeh9fvA45Oj3J1TjPWpvKQT5qj8NU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Ohdl99h/5epbONaYeGSC02evWcGe+8FtZ53RXHHsMpg=";
|
||||
vendorSha256 = "sha256-FCLhAJxEPskigvlzvm5A+hVQOSWqqZnAxCPe7cawryA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "HTTP(S)/WS(S)/TCP Tunnels to localhost";
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "evtx";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omerbenamram";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T165PZhjuX5tUENZoO6x1u2MpMQTfv9dGRmxyNY2ACg=";
|
||||
hash = "sha256-iexSMcD4XHEYeVWWQXQ7VLZwtUQeEkvrLxMXuxYuxts=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qcjJoXB0DV1Z5bhGrtyJzfWqE+tVWBOYMJEd+MWFcD8=";
|
||||
cargoSha256 = "sha256-6dDv4+yEKxFjbguMfQxPm18PgZ2DC9IVbmpw2N94mEo=";
|
||||
|
||||
postPatch = ''
|
||||
# CLI tests will fail in the sandbox
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wslu";
|
||||
version = "3.2.4";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wslutilities";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bZFccqFZF6Xt0yAw6JSONNhosBliHQc7KJQ8Or7UvMA=";
|
||||
hash = "sha256-bW/otr1kqmH2N5sD3R9kYCZyn+BbBZ2fCVGlP1pFnK8=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "guest-agent";
|
||||
version = "20220713.00";
|
||||
version = "20220824.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-6N6ikAIpqbtNgD6TTASbMzCJcBc7D3ziE4YvQmTb1Go=";
|
||||
sha256 = "sha256-dOLxluLLBpPeABlUdxCmSnSvB+N9CBixEubpVLqsicU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI=";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sov";
|
||||
version = "0.72";
|
||||
version = "0.73";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "milgra";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-av+st0tux+ho8bfJwx6Nk1pma1Pjvv/dpW5BWnUDNvQ=";
|
||||
sha256 = "sha256-cjbTSvW1fCPl2wZ848XrUPU0bDQ4oXy+D8GqyBMaTwQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -717,6 +717,7 @@ mapAliases ({
|
|||
liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22
|
||||
liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22
|
||||
libgksu = throw "libgksu has been removed"; # Added 2022-01-16
|
||||
libgme = game-music-emu; # Added 2022-07-20
|
||||
libgnome_keyring = throw "'libgnome_keyring' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2022-02-22
|
||||
libgnome_keyring3 = throw "'libgnome_keyring3' has been renamed to/replaced by 'libgnome-keyring3'"; # Converted to throw 2022-02-22
|
||||
libgpgerror = libgpg-error; # Added 2021-09-04
|
||||
|
|
|
|||
|
|
@ -21222,8 +21222,6 @@ with pkgs;
|
|||
|
||||
lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { };
|
||||
|
||||
libgme = callPackage ../development/libraries/audio/libgme { };
|
||||
|
||||
librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
|
||||
|
||||
librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };
|
||||
|
|
@ -27773,7 +27771,9 @@ with pkgs;
|
|||
shiboken2;
|
||||
};
|
||||
|
||||
freedv = callPackage ../applications/radio/freedv { };
|
||||
freedv = callPackage ../applications/radio/freedv {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;
|
||||
};
|
||||
|
||||
freemind = callPackage ../applications/misc/freemind {
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
|
|
@ -28809,8 +28809,6 @@ with pkgs;
|
|||
kube-score = callPackage ../applications/networking/cluster/kube-score { };
|
||||
|
||||
kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod {
|
||||
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
|
||||
kubeval = callPackage ../applications/networking/cluster/kubeval { };
|
||||
|
|
|
|||
|
|
@ -6746,6 +6746,8 @@ in {
|
|||
|
||||
pickleshare = callPackage ../development/python-modules/pickleshare { };
|
||||
|
||||
picobox = callPackage ../development/python-modules/picobox { };
|
||||
|
||||
picos = callPackage ../development/python-modules/picos { };
|
||||
|
||||
pid = callPackage ../development/python-modules/pid { };
|
||||
|
|
@ -10358,6 +10360,8 @@ in {
|
|||
|
||||
sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { };
|
||||
|
||||
sphinx-mdinclude = callPackage ../development/python-modules/sphinx-mdinclude { };
|
||||
|
||||
sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { };
|
||||
|
||||
sphinx-rtd-theme = callPackage ../development/python-modules/sphinx-rtd-theme { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue