mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
commit
a18880bf72
32 changed files with 216 additions and 99 deletions
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0v1g7j5q2j86c3r7jib8xs1sf2h3xvwv1s0xsqbig480fchlshjg";
|
||||
x86_64-darwin = "109529acrvyassq00mbhnwbxq7rfq9n69rgcw4n0rysgp8n58386";
|
||||
aarch64-linux = "0p6pz9apbfmr4pf7fikp2rmvk5gr87md1zrhr6hhd1qwgpc9kl07";
|
||||
armv7l-linux = "1qrp75nbzgqp7mv42m6wbj000l33rhfv7cnxdv6lp6cy05381aq6";
|
||||
x86_64-linux = "0l4lx5h2daw9c5vl4kz6sq2i58b45xy4948x4q0wnwbqdqlqc9s4";
|
||||
x86_64-darwin = "0qqgs7vns52bz9xkys822sjjkvyq4l20iipz6sx5kinxg6h04jyy";
|
||||
aarch64-linux = "1gnh5kk4r0kfik9yfvvcbavhws4n8kn89kyl2qzpa2ryy52kk81j";
|
||||
armv7l-linux = "0zz5fn9nxq58i3svhgc25s6fdz7i3rxc0naflyx1jzmpzipp4v6n";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
|
|
@ -25,7 +25,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.56.0";
|
||||
version = "1.56.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
unpackPhase = lib.optionalString stdenv.isDarwin ''
|
||||
xar -xf $src
|
||||
zcat Payload | cpio -i
|
||||
zcat op.pkg/Payload | cpio -i
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -44,14 +44,16 @@ with lib;
|
|||
# Those pieces of software we entirely ignore upstream's handling of, and just
|
||||
# make sure they're in the path if desired.
|
||||
let
|
||||
k3sVersion = "1.20.6+k3s1"; # k3s git tag
|
||||
traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag
|
||||
k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag
|
||||
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag
|
||||
k3sVersion = "1.21.0+k3s1"; # k3s git tag
|
||||
k3sCommit = "2705431d9645d128441c578309574cd262285ae6"; # k3s git commit at the above version
|
||||
|
||||
traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION
|
||||
k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION
|
||||
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS
|
||||
# bundled into the k3s binary
|
||||
traefikChart = fetchurl {
|
||||
url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz";
|
||||
sha256 = "1aqpzgjlvqhil0g3angz94zd4xbl4iq0qmpjcy5aq1xv9qciwdi9";
|
||||
url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz";
|
||||
sha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI=";
|
||||
};
|
||||
# so, k3s is a complicated thing to package
|
||||
# This derivation attempts to avoid including any random binaries from the
|
||||
|
|
@ -95,8 +97,7 @@ let
|
|||
k3sRepo = fetchgit {
|
||||
url = "https://github.com/k3s-io/k3s";
|
||||
rev = "v${k3sVersion}";
|
||||
leaveDotGit = true; # ./scripts/version.sh depends on git
|
||||
sha256 = "sha256-IIZotJKQ/+WNmfcEJU5wFtZBufWjUp4MeVCRk4tSjyQ=";
|
||||
sha256 = "sha256-xsXxf2ZYrkpOHlSFqTsHwWF3kChUjxWRjyDR3Dhg2ho=";
|
||||
};
|
||||
# Stage 1 of the k3s build:
|
||||
# Let's talk about how k3s is structured.
|
||||
|
|
@ -134,9 +135,13 @@ let
|
|||
# those.
|
||||
patches = [ ./patches/0002-Add-nixpkgs-patches.patch ];
|
||||
|
||||
nativeBuildInputs = [ git pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libseccomp ];
|
||||
|
||||
# Versioning info for build script
|
||||
DRONE_TAG = "v${version}";
|
||||
DRONE_COMMIT = k3sCommit;
|
||||
|
||||
buildPhase = ''
|
||||
pushd go/src/${goPackagePath}
|
||||
|
||||
|
|
@ -175,7 +180,7 @@ let
|
|||
# See the above comment in k3sBuildStage1
|
||||
patches = [ ./patches/0002-Add-nixpkgs-patches.patch ];
|
||||
|
||||
nativeBuildInputs = [ git pkg-config zstd ];
|
||||
nativeBuildInputs = [ pkg-config zstd ];
|
||||
# These dependencies are embedded as compressed files in k3s at runtime.
|
||||
# Propagate them to avoid broken runtime references to libraries.
|
||||
propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ];
|
||||
|
|
@ -186,6 +191,9 @@ let
|
|||
else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64"
|
||||
else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet.";
|
||||
|
||||
DRONE_TAG = "v${version}";
|
||||
DRONE_COMMIT = k3sCommit;
|
||||
|
||||
# In order to build the thick k3s binary (which is what
|
||||
# ./scripts/package-cli does), we need to get all the binaries that script
|
||||
# expects in place.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octant";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
in
|
||||
fetchsrc version {
|
||||
x86_64-linux = "sha256-TKvUBof4TLcHr9hg6AOLjVd1NcAX9HHVuuABdFKRNQA=";
|
||||
aarch64-linux = "sha256-BJb7h6kJZ3QhdlEqNHkiFp91uYLXzYHvKftxEAhjY38=";
|
||||
x86_64-darwin = "sha256-Ig98IqLmlN9D4iXrP9SXYwTrQOvbtQ/tQW+uEmntm+I=";
|
||||
x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A=";
|
||||
aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg=";
|
||||
x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "octant-desktop";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -15,8 +15,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-1XFb0zuyOy8XEUd9hoexItjq4assuWlWIzqw7pZxHx0=";
|
||||
x86_64-darwin = "sha256-e3v5BFX7wnx4sAQrOq+dBIDVPJYzQZKKvKjSX+dis2U=";
|
||||
x86_64-linux = "sha256-mPD5qa/IYsakjcoPnWVpkmhgkhnRK0qTGQ6hanzDt/Y=";
|
||||
x86_64-darwin = "sha256-nxpwBRUeLSPqNEFjF8hKzRhA2ahqh/KyAitnSxYdyJ8=";
|
||||
}.${system};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -76,28 +76,31 @@
|
|||
"version": "3.27.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "terraform-providers",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v0.10.0",
|
||||
"sha256": "0i9xrsqgh1024189hihm2nqrcy2pcyf1bwxnamwmwph5cas6hfb3",
|
||||
"version": "0.10.0"
|
||||
"rev": "v1.4.0",
|
||||
"sha256": "13y0h8af37gfsjhccbfsnj6kqcn61lr1znmsxipjr5h9ka5lc209",
|
||||
"vendorSha256": null,
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"azurerm": {
|
||||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v2.13.0",
|
||||
"sha256": "0aj19vy1flpb2233rxaypjcfimjr1wfqri1m3p15dy1r108q84r7",
|
||||
"version": "2.13.0"
|
||||
"rev": "v2.58.0",
|
||||
"sha256": "1zy3q5d63pz2rdczcs9xnxzasb2jbzhyg8nbk2r252mdnhx6h9vh",
|
||||
"vendorSha256": null,
|
||||
"version": "2.58.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "terraform-providers",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurestack",
|
||||
"repo": "terraform-provider-azurestack",
|
||||
"rev": "v0.9.0",
|
||||
"sha256": "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324",
|
||||
"version": "0.9.0"
|
||||
"rev": "v0.10.0",
|
||||
"sha256": "0lcwrp6n3l1nink06wq2nrirs6k3wwjmya1w06x14pvqqdj1d5c8",
|
||||
"vendorSha256": null,
|
||||
"version": "0.10.0"
|
||||
},
|
||||
"baiducloud": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -495,6 +498,7 @@
|
|||
},
|
||||
"keycloak": {
|
||||
"owner": "mrparkers",
|
||||
"provider-source-address": "registry.terraform.io/mrparkers/keycloak",
|
||||
"repo": "terraform-provider-keycloak",
|
||||
"rev": "v3.0.0",
|
||||
"sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a",
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ let
|
|||
pname = "wire-desktop";
|
||||
|
||||
version = {
|
||||
x86_64-darwin = "3.24.4059";
|
||||
x86_64-linux = "3.24.2939";
|
||||
x86_64-darwin = "3.25.4095";
|
||||
x86_64-linux = "3.25.2940";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sha256 = {
|
||||
x86_64-darwin = "1zjv3d8jp0wldrzl02q9kir7q3y5bcb6hsfli6wip8bmaq78dksy";
|
||||
x86_64-linux = "1k9n58pr5fnqv9vacay5vrbs4pvq2p36c0dpg9rjdcnb2fwaqg5p";
|
||||
x86_64-darwin = "01gbmbxs3w7lwsy5wjpr7fgqkb20rj5fv1r3dsmjkfwy45pd835j";
|
||||
x86_64-linux = "1vb2fy8hijjp0193d32d8hw7h00w6wympf3zc96skk8hz3ks6xz8";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript
|
||||
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg
|
||||
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip
|
||||
, lsb-release, freetype, fontconfig, polkit, polkit_gnome
|
||||
, pulseaudio }:
|
||||
|
||||
|
|
@ -43,8 +43,8 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
|
||||
gnome2.gtkglext libGLU libGL freetype fontconfig
|
||||
polkit polkit_gnome pulseaudio
|
||||
gnome2.gtkglext libGLU libGL minizip freetype
|
||||
fontconfig polkit polkit_gnome pulseaudio
|
||||
] ++ (with xorg; [
|
||||
libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu
|
||||
libXrandr libXtst libXt libICE libSM libXrender
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ with pythonPackages;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "watson";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TailorDev";
|
||||
repo = "Watson";
|
||||
rev = version;
|
||||
sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0";
|
||||
sha256 = "0radf5afyphmzphfqb4kkixahds2559nr3yaqvni4xrisdaiaymz";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rio+3S3bA8KfosKAE9Txzftr/q2PVyd8Z9crz1O/ysc=";
|
||||
sha256 = "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-17bIeK/mPE+rAO/c65IWvMGqAU6sOClJQC8z+O36cmU=";
|
||||
cargoSha256 = "1dpklyv1b9h4n4k3ar5qbzivds8r4mml76986ic8zj71fy5fxn08";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohue";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1xinllv2cvxl9fxi15nayzw9lfzijb3m7i49gkkr46qr8xvsavyk";
|
||||
sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "denonavr";
|
||||
version = "0.10.7";
|
||||
version = "0.10.8";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scarface-4711";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-IGfU9nnlfZf8U6pCzG7cegmqxmDNONom0U14PZHHaYY=";
|
||||
sha256 = "02q76mbmg2rkm4shy2apwbw9pvicy9j5v4zgpjwzxif9yf7m8aqk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
25
pkgs/development/python-modules/py-dmidecode/default.nix
Normal file
25
pkgs/development/python-modules/py-dmidecode/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, dmidecode }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-dmidecode";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1bv1vmhj8h520kj6slwpz16xfmgp117yjjkfyihkl5ix6mn5zkpa";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dmidecode ];
|
||||
|
||||
# Project has no tests.
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "dmidecode" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/zaibon/py-dmidecode/";
|
||||
description = "Python library that parses the output of dmidecode";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ davidtwco ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-ls";
|
||||
version = "0.16.0";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8Bo6ZSpecdMX/Hoj0N1/iptfqybPUoQ0T9IQima+Bbo=";
|
||||
sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY=";
|
||||
};
|
||||
vendorSha256 = "sha256-oP7ZekG7YdRhUvt48wxalt8y8QmVFkAw9GRIKBmi9sg=";
|
||||
vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os=";
|
||||
|
||||
# tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -16,19 +16,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.9.2";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FKhSFqFZhqzrXrJcBc0YBNHoUq0/1+ULZ9sE+LyNQTI=";
|
||||
sha256 = "sha256-aNStR86biNHwyg3dSI+CGib3XFhL5ZJ55d29E2K9qd0=";
|
||||
};
|
||||
cargoSha256 = "sha256-Pp322D7YtdpeNnKWcE78tvLh5nFNcrh9oGYX2eCiPzI=";
|
||||
cargoSha256 = "sha256-JXjiI+fTB0YlnhKO6QfGl4YOEQNfpuWsza2TsM9fwIk=";
|
||||
|
||||
# Install completions post-install
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildAndTestSubdir = "cli";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ];
|
||||
|
||||
# The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
|
||||
|
|
@ -51,9 +53,6 @@ rustPlatform.buildRustPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
# remove test plugin and test server
|
||||
rm -r $out/lib $out/bin/test_server $out/bin/denort
|
||||
|
||||
installShellCompletion --cmd deno \
|
||||
--bash <($out/bin/deno completions bash) \
|
||||
--fish <($out/bin/deno completions fish) \
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ let
|
|||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.22.1";
|
||||
version = "0.22.2";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-rHI5qzwmDvlIdjUCZwvl6/s2Oe6d3/V7TJwfP1AFjik=";
|
||||
aarch64-linux = "sha256-7VhrOkzWayZFTsq0II5uh+TxXaIDSkc0E19ZwT3Hl6c=";
|
||||
x86_64-darwin = "sha256-zXXL2YqgjFmuDHGReIGWVxfSS3PMND0J0qlHRV/rKs8=";
|
||||
aarch64-darwin = "sha256-X/CCJn5yWJH2x6lCGAFllrQUj7XLA3TICRP3aiWytjk=";
|
||||
x86_64-linux = "sha256-bLGSt9a+drzXMy64iiERFHfdDsIR2YqwwNlkpzIM07Q=";
|
||||
aarch64-linux = "sha256-MtCB7XaFho+a64fidPO88URIq7X9HvGqN5a9hzuCX4s=";
|
||||
x86_64-darwin = "sha256-aLeZ0cIdmQHDxSGPx6IBwweZWwDI/m/1kFQTC7dQ3bs=";
|
||||
aarch64-darwin = "sha256-SZGx/kRvp88mfMqDX+d4GNDs4t+P383kjnNPqwkqkHI=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
44
pkgs/games/steam-tui/default.nix
Normal file
44
pkgs/games/steam-tui/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, steamcmd
|
||||
, fetchFromGitHub
|
||||
, steam-run-native
|
||||
, runtimeShell
|
||||
, withWine ? false
|
||||
, wine
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "steam-tui";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmadisetti";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UTXYlPecv0MVonr9zZwfwopfC/Fdch/ZSCxqgUsem40=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo=";
|
||||
|
||||
buildInputs = [ steamcmd steam-run-native ]
|
||||
++ lib.optional withWine wine;
|
||||
|
||||
preFixup = ''
|
||||
mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped
|
||||
cat > $out/bin/steam-tui <<EOF
|
||||
#!${runtimeShell}
|
||||
exec steam-run $out/bin/.steam-tui-unwrapped '$@'
|
||||
EOF
|
||||
chmod +x $out/bin/steam-tui
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rust TUI client for steamcmd";
|
||||
homepage = "https://github.com/dmadisetti/steam-tui";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
# steam only supports that platform
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802";
|
||||
sha256 = "63756ac5a00c3e4a066ed231a287faef5963a9183d77326e30bf0644cdf74f86";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.5.2";
|
||||
version = "2021.5.3";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ let
|
|||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.5.2";
|
||||
hassVersion = "2021.5.3";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -133,7 +133,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "1v1ah0kdkhx0pkma2qnk56iv00r2lb4i3sfpwlcr64gfkpzpakv8";
|
||||
sha256 = "1zc21d70n24sk8y42xq3gzisj44kn6w6fhgqrcani470hhph24ba";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
|||
s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
|
||||
s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
|
||||
s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
|
||||
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/:
|
||||
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/:
|
||||
''}
|
||||
${lib.optionalString enableAuthDovecot ''
|
||||
s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.28.0";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YbWh4ZIlcxAD/8F/fsYIWjv5hKaHNNi+sNrD7Ax/xDw=";
|
||||
sha256 = "sha256-yTsmgRs3H5do1lG28RU/OY5QJFcwvkrsV/HGuVzD+3M=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.17.2";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ub3rIiOJUh3vNCC+82rCSzKSovMnRW2jo8HbI02ouws=";
|
||||
sha256 = "sha256-D4oqLyH5JU8AycRZuA0isQmE3UP/0WmBmKW3xvSzk2M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xL0wqKFMQksaLkTAxV72SWh0PPTbOqWcd6deJ9RVeEA=";
|
||||
vendorSha256 = "sha256-R50alGFyb2ZR7PT1jIsYWMIO45CPet+A5wq+clC1NIY=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
, libheif
|
||||
, librsvg
|
||||
, ApplicationServices
|
||||
, Foundation
|
||||
, python27
|
||||
, libpng
|
||||
, fetchFromGitHub
|
||||
|
|
@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||
python27
|
||||
libpng
|
||||
expat
|
||||
] ++ lib.optional stdenv.isDarwin ApplicationServices;
|
||||
] ++ lib.optionals stdenv.isDarwin [ApplicationServices Foundation];
|
||||
|
||||
# Required by .pc file
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, libiconv
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
@ -16,6 +20,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "0vy6q3hjp374lyg00zxim8aplh83iq3f4rrmpz5vnpwbag1fdql3";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines";
|
||||
homepage = "https://github.com/ellie/atuin";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, libiconv
|
||||
, Security
|
||||
}:
|
||||
|
||||
|
|
@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
cargoPatches = [
|
||||
# Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1
|
||||
|
|
@ -30,6 +31,9 @@ rustPlatform.buildRustPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
# Tries to send large UDP packets that Darwin rejects.
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "UDP-based load generator";
|
||||
homepage = "https://github.com/rozgo/anevicon";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "9.1.2";
|
||||
version = "9.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7v8vz0n35ATWdmMcM2U7z1sONbmsaWQahHsramivm88=";
|
||||
sha256 = "rVR2KfrK7M74kZUm5q23Lbj7hTLCN+p12RBaf3JAEXM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-IAyiD4v2UEGlWj8oZ0E3YhqyThJTjwjWjOzQKuj6Q9s=";
|
||||
vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "network-manager-applet";
|
||||
version = "1.20.0";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla";
|
||||
sha256 = "sha256-xw2AtI1AqcuZ7JZ8xDifZ+fwMBUopp1IFXIEEzGmRr4=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,39 @@
|
|||
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
|
||||
, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
|
||||
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config
|
||||
, encfs, libsecret , glib , libgee, gtk3, vala, wrapGAppsHook, xorg
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.8.19";
|
||||
version = "1.9";
|
||||
pname = "gnome-encfs-manager";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz";
|
||||
sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i";
|
||||
url = with lib.versions;
|
||||
"https://launchpad.net/gencfsm/trunk/${major version}.${minor version}/+download/gnome-encfs-manager_${version}.tar.xz";
|
||||
sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ autoconf automake intltool libtool vala glib encfs
|
||||
gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
|
||||
wrapGAppsHook gobject-introspection ];
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
intltool
|
||||
libtool
|
||||
pkg-config
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
glib
|
||||
encfs
|
||||
gtk3
|
||||
libgee
|
||||
xorg.libSM
|
||||
xorg.libICE
|
||||
gobject-introspection
|
||||
libsecret
|
||||
];
|
||||
|
||||
# Fix hardcoded paths to /bin/mkdir
|
||||
patches = [ ./makefile-mkdir.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3,
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3,
|
||||
boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml,
|
||||
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "poedit";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz";
|
||||
sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vslavik";
|
||||
repo = "poedit";
|
||||
rev = "v${version}-oss";
|
||||
sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
|
||||
|
|
@ -41,6 +43,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.poedit.net/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ dasj19 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -156,7 +156,9 @@ in
|
|||
|
||||
antsimulator = callPackage ../games/antsimulator { };
|
||||
|
||||
atuin = callPackage ../tools/misc/atuin { };
|
||||
atuin = callPackage ../tools/misc/atuin {
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
|
||||
fiche = callPackage ../servers/fiche { };
|
||||
|
||||
|
|
@ -28452,6 +28454,8 @@ in
|
|||
nativeOnly = true;
|
||||
}).run;
|
||||
|
||||
steam-tui = callPackage ../games/steam-tui { };
|
||||
|
||||
steamcmd = steamPackages.steamcmd;
|
||||
|
||||
protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
|
||||
|
|
@ -30861,7 +30865,7 @@ in
|
|||
vimb = wrapFirefox vimb-unwrapped { };
|
||||
|
||||
vips = callPackage ../tools/graphics/vips {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
|
||||
};
|
||||
nip2 = callPackage ../tools/graphics/nip2 { };
|
||||
|
||||
|
|
|
|||
|
|
@ -5304,6 +5304,8 @@ in {
|
|||
|
||||
py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
|
||||
|
||||
py-dmidecode = callPackage ../development/python-modules/py-dmidecode { };
|
||||
|
||||
py-ubjson = callPackage ../development/python-modules/py-ubjson { };
|
||||
|
||||
py2bit = callPackage ../development/python-modules/py2bit { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue