mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-18 11:43:17 +02:00
Merge staging-next into staging
This commit is contained in:
commit
054a265ed6
4
.github/CODEOWNERS
vendored
4
.github/CODEOWNERS
vendored
|
@ -94,10 +94,6 @@
|
||||||
/pkgs/applications/science/math/R @peti
|
/pkgs/applications/science/math/R @peti
|
||||||
/pkgs/development/r-modules @peti
|
/pkgs/development/r-modules @peti
|
||||||
|
|
||||||
# Ruby
|
|
||||||
/pkgs/development/interpreters/ruby @alyssais
|
|
||||||
/pkgs/development/ruby-modules @alyssais
|
|
||||||
|
|
||||||
# Rust
|
# Rust
|
||||||
/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq
|
/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq
|
||||||
/pkgs/build-support/rust @andir @danieldk @zowoq
|
/pkgs/build-support/rust @andir @danieldk @zowoq
|
||||||
|
|
|
@ -1106,6 +1106,12 @@
|
||||||
githubId = 14111;
|
githubId = 14111;
|
||||||
name = "Brandon Dimcheff";
|
name = "Brandon Dimcheff";
|
||||||
};
|
};
|
||||||
|
beardhatcode = {
|
||||||
|
name = "Robbert Gurdeep Singh";
|
||||||
|
email = "nixpkgs@beardhatcode.be";
|
||||||
|
github = "beardhatcode";
|
||||||
|
githubId = 662538;
|
||||||
|
};
|
||||||
bendlas = {
|
bendlas = {
|
||||||
email = "herwig@bendlas.net";
|
email = "herwig@bendlas.net";
|
||||||
github = "bendlas";
|
github = "bendlas";
|
||||||
|
@ -3615,6 +3621,12 @@
|
||||||
githubId = 76716;
|
githubId = 76716;
|
||||||
name = "Graham Christensen";
|
name = "Graham Christensen";
|
||||||
};
|
};
|
||||||
|
gravndal = {
|
||||||
|
email = "gaute.ravndal+nixos@gmail.com";
|
||||||
|
github = "gravndal";
|
||||||
|
githubId = 4656860;
|
||||||
|
name = "Gaute Ravndal";
|
||||||
|
};
|
||||||
grburst = {
|
grburst = {
|
||||||
email = "GRBurst@protonmail.com";
|
email = "GRBurst@protonmail.com";
|
||||||
github = "GRBurst";
|
github = "GRBurst";
|
||||||
|
@ -10470,6 +10482,12 @@
|
||||||
githubId = 13489144;
|
githubId = 13489144;
|
||||||
name = "Calle Rosenquist";
|
name = "Calle Rosenquist";
|
||||||
};
|
};
|
||||||
|
xdhampus = {
|
||||||
|
name = "Hampus";
|
||||||
|
email = "16954508+xdHampus@users.noreply.github.com";
|
||||||
|
github = "xdHampus";
|
||||||
|
githubId = 16954508;
|
||||||
|
};
|
||||||
xe = {
|
xe = {
|
||||||
email = "me@christine.website";
|
email = "me@christine.website";
|
||||||
github = "Xe";
|
github = "Xe";
|
||||||
|
|
|
@ -1017,6 +1017,14 @@ systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
|
||||||
will have changed.
|
will have changed.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The syntax of the PostgreSQL configuration file is now checked at build
|
||||||
|
time. If your configuration includes a file inaccessible inside the build
|
||||||
|
sandbox, set <varname>services.postgresql.checkConfig</varname> to
|
||||||
|
<literal>false</literal>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The rkt module has been removed, it was archived by upstream.
|
The rkt module has been removed, it was archived by upstream.
|
||||||
|
|
29
nixos/modules/hardware/ubertooth.nix
Normal file
29
nixos/modules/hardware/ubertooth.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.hardware.ubertooth;
|
||||||
|
|
||||||
|
ubertoothPkg = pkgs.ubertooth.override {
|
||||||
|
udevGroup = cfg.group;
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
options.hardware.ubertooth = {
|
||||||
|
enable = mkEnableOption "Enable the Ubertooth software and its udev rules.";
|
||||||
|
|
||||||
|
group = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "ubertooth";
|
||||||
|
example = "wheel";
|
||||||
|
description = "Group for Ubertooth's udev rules.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
environment.systemPackages = [ ubertoothPkg ];
|
||||||
|
|
||||||
|
services.udev.packages = [ ubertoothPkg ];
|
||||||
|
users.groups.${cfg.group} = {};
|
||||||
|
};
|
||||||
|
}
|
|
@ -67,6 +67,7 @@
|
||||||
./hardware/steam-hardware.nix
|
./hardware/steam-hardware.nix
|
||||||
./hardware/system-76.nix
|
./hardware/system-76.nix
|
||||||
./hardware/tuxedo-keyboard.nix
|
./hardware/tuxedo-keyboard.nix
|
||||||
|
./hardware/ubertooth.nix
|
||||||
./hardware/usb-wwan.nix
|
./hardware/usb-wwan.nix
|
||||||
./hardware/onlykey.nix
|
./hardware/onlykey.nix
|
||||||
./hardware/opentabletdriver.nix
|
./hardware/opentabletdriver.nix
|
||||||
|
|
|
@ -18,7 +18,12 @@ let
|
||||||
else toString value;
|
else toString value;
|
||||||
|
|
||||||
# The main PostgreSQL configuration file.
|
# The main PostgreSQL configuration file.
|
||||||
configFile = pkgs.writeText "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings));
|
configFile = pkgs.writeTextDir "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings));
|
||||||
|
|
||||||
|
configFileCheck = pkgs.runCommand "postgresql-configfile-check" {} ''
|
||||||
|
${cfg.package}/bin/postgres -D${configFile} -C config_file >/dev/null
|
||||||
|
touch $out
|
||||||
|
'';
|
||||||
|
|
||||||
groupAccessAvailable = versionAtLeast postgresql.version "11.0";
|
groupAccessAvailable = versionAtLeast postgresql.version "11.0";
|
||||||
|
|
||||||
|
@ -53,6 +58,12 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
checkConfig = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Check the syntax of the configuration file at compile time";
|
||||||
|
};
|
||||||
|
|
||||||
dataDir = mkOption {
|
dataDir = mkOption {
|
||||||
type = types.path;
|
type = types.path;
|
||||||
defaultText = "/var/lib/postgresql/\${config.services.postgresql.package.psqlSchema}";
|
defaultText = "/var/lib/postgresql/\${config.services.postgresql.package.psqlSchema}";
|
||||||
|
@ -314,6 +325,8 @@ in
|
||||||
"/share/postgresql"
|
"/share/postgresql"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
system.extraDependencies = lib.optional (cfg.checkConfig && pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) configFileCheck;
|
||||||
|
|
||||||
systemd.services.postgresql =
|
systemd.services.postgresql =
|
||||||
{ description = "PostgreSQL Server";
|
{ description = "PostgreSQL Server";
|
||||||
|
|
||||||
|
@ -337,7 +350,7 @@ in
|
||||||
touch "${cfg.dataDir}/.first_startup"
|
touch "${cfg.dataDir}/.first_startup"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf"
|
ln -sfn "${configFile}/postgresql.conf" "${cfg.dataDir}/postgresql.conf"
|
||||||
${optionalString (cfg.recoveryConfig != null) ''
|
${optionalString (cfg.recoveryConfig != null) ''
|
||||||
ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
|
ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
|
||||||
"${cfg.dataDir}/recovery.conf"
|
"${cfg.dataDir}/recovery.conf"
|
||||||
|
|
|
@ -15,13 +15,13 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "btcpayserver";
|
pname = "btcpayserver";
|
||||||
version = "1.0.7.0";
|
version = "1.0.7.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1pbq0kik29sx1lwlic7fvhnjhrpnlk94w53wmywqnlpgjscx8x8a";
|
sha256 = "1hxpbzc4l1zxrcvmdm93vvphhksfwd0mw2dv6h8vi4451p77dhd9";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
|
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
|
{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
|
||||||
let
|
let
|
||||||
pname = "josm";
|
pname = "josm";
|
||||||
version = "17580";
|
version = "17702";
|
||||||
srcs = {
|
srcs = {
|
||||||
jar = fetchurl {
|
jar = fetchurl {
|
||||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||||
sha256 = "05y1g48llnpbyv0r8dn3kyhcfqylsg4fbp540xn1n7sk3h17gwsw";
|
sha256 = "1p7p0jd87sxrs5n0r82apkilx0phgmjw7vpdg8qrr5msda4rsmpk";
|
||||||
};
|
};
|
||||||
macosx = fetchurl {
|
macosx = fetchurl {
|
||||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip";
|
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip";
|
||||||
sha256 = "0aqkr6951zbi7a6zawvpsh51i0c4nyz2xkj52gg8n4vxli5pp3y1";
|
sha256 = "0r17cphxm852ykb8mkil29rr7sb0bj5w69qd5wz8zf2f9djk9npk";
|
||||||
};
|
};
|
||||||
pkg = fetchsvn {
|
pkg = fetchsvn {
|
||||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "04mxrirlyjy8i5s6y8w84kxv3wjlhhdfmlaxxlxd25viim73g3zv";
|
sha256 = "1b7dryvakph8znh2ahgywch66l4bl5rmgsr79axnz1xi12g8ac12";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
|
@ -4,6 +4,8 @@ ocamlPackages.buildDunePackage rec {
|
||||||
pname = "orpie";
|
pname = "orpie";
|
||||||
version = "1.6.1";
|
version = "1.6.1";
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pelzlpj";
|
owner = "pelzlpj";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev
|
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, udev
|
||||||
, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1
|
, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1
|
||||||
, libsndfile, libmad
|
, libsndfile, libmad
|
||||||
}:
|
}:
|
||||||
|
@ -14,6 +14,14 @@ mkDerivation rec {
|
||||||
sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs=";
|
sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "qt5.15-deprecation-fixes.patch";
|
||||||
|
url = "https://github.com/mcallegari/qlcplus/commit/e4ce4b0226715876e8e9e3b23785d43689b2bb64.patch";
|
||||||
|
sha256 = "1zhrg6ava1nyc97xcx75r02zzkxmar0973w4jwkm5ch3iqa8bqnh";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake pkg-config ];
|
nativeBuildInputs = [ qmake pkg-config ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad
|
udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad
|
||||||
|
|
|
@ -3,11 +3,12 @@ lib, stdenv
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, jdk11
|
||||||
, jdk8
|
, jdk8
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
generic = { version, sha256, ... }@attrs:
|
generic = { version, sha256, platform ? "", jdk, ... }@attrs:
|
||||||
let
|
let
|
||||||
desktopItem = makeDesktopItem {
|
desktopItem = makeDesktopItem {
|
||||||
categories = "Network;Development;WebDevelopment;Java;";
|
categories = "Network;Development;WebDevelopment;Java;";
|
||||||
|
@ -25,13 +26,13 @@ let
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
|
url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}${platform}.tar.gz";
|
||||||
inherit sha256;
|
inherit sha256;
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \
|
makeWrapper ${jdk}/bin/java $out/bin/charles \
|
||||||
--add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
|
--add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
|
||||||
|
|
||||||
for fn in lib/*.jar; do
|
for fn in lib/*.jar; do
|
||||||
|
@ -56,12 +57,15 @@ let
|
||||||
|
|
||||||
in {
|
in {
|
||||||
charles4 = (generic {
|
charles4 = (generic {
|
||||||
version = "4.2.8";
|
version = "4.6.1";
|
||||||
sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080";
|
sha256 = "1kl83jjj5wjhdpj34gcj04vf1asxlqlfx9zi91ln4v90swlaaclv";
|
||||||
|
platform = "_amd64";
|
||||||
|
jdk = jdk11;
|
||||||
});
|
});
|
||||||
charles3 = (generic {
|
charles3 = (generic {
|
||||||
version = "3.12.3";
|
version = "3.12.3";
|
||||||
sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss";
|
sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss";
|
||||||
|
jdk = jdk8.jre;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.10.0";
|
version = "0.11.0";
|
||||||
|
|
||||||
manifests = fetchzip {
|
manifests = fetchzip {
|
||||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||||
sha256 = "Der1Ud27eIV450KkxDTF2frmeKEHKsg6vJgdXE+3548=";
|
sha256 = "sha256-nqvFJriNMK3SvAsNzhE8MCzVNR8j/TjYU+f1PbuxkuI=";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
@ -19,10 +19,10 @@ buildGoModule rec {
|
||||||
owner = "fluxcd";
|
owner = "fluxcd";
|
||||||
repo = "flux2";
|
repo = "flux2";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "iJ6UyHbF4+RvfNoOuHt6X2R6XhpBe+t76deldwY5P2c=";
|
sha256 = "sha256-V4cZuRlC1Hu4gBG5/8ZNBKlSBFLgOtSJ3GbpjW5/8xM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "Z0keCr+KZ593c6a/56lYJwOgXu5hrUSn6N3NFf2LDUM=";
|
vendorSha256 = "sha256-aVVvrOjCKxzFer5uZRSu1LCQKkGkPcBdKdebN5uHUUg=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -2,20 +2,22 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "tanka";
|
pname = "tanka";
|
||||||
version = "0.14.0";
|
version = "0.15.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "grafana";
|
owner = "grafana";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-y2HhtYKgC9Y397dZ14eQoPZxqS1fTOXVD8B4wdLIHzM=";
|
sha256 = "sha256-ckXvDB3TU9HAXowAAr/fRmX3mylVvPKW8I74R/vUaRY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw=";
|
vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
|
subPackages = [ "cmd/tk" ];
|
||||||
|
|
||||||
|
buildFlagsArray = [ "-ldflags=-s -w -extldflags \"-static\" -X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
@ -26,7 +28,7 @@ buildGoModule rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Flexible, reusable and concise configuration for Kubernetes";
|
description = "Flexible, reusable and concise configuration for Kubernetes";
|
||||||
homepage = "https://github.com/grafana/tanka/";
|
homepage = "https://tanka.dev";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ mikefaille ];
|
maintainers = with maintainers; [ mikefaille ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
|
|
@ -2,34 +2,43 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "protonmail-bridge";
|
pname = "protonmail-bridge";
|
||||||
version = "1.5.0";
|
version = "1.6.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ProtonMail";
|
owner = "ProtonMail";
|
||||||
repo = "proton-bridge";
|
repo = "proton-bridge";
|
||||||
rev = "br-${version}";
|
rev = "br-${version}";
|
||||||
sha256 = "lHqwKlFwz9iO7LJMGFTGCauw12z/BKnQte2sVoVkOaY=";
|
sha256 = "0p2315smxc5knxzr9413w62z65647znh9j9vyb6w5x4dqfp7vhz9";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "eP+7fqBctX9XLCoHVJDI/qaa5tocgg3F5nfUM6dzNRg=";
|
vendorSha256 = "04aa7syp5hhpqxdpqlsmmbwywnbrh4ia0diym2935jbrqccnvm1k";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ libsecret ];
|
buildInputs = [ libsecret ];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
make BUILD_TIME= build-nogui
|
runHook preBuild
|
||||||
|
|
||||||
|
patchShebangs ./utils/
|
||||||
|
make BUILD_TIME= -j$NIX_BUILD_CORES build-nogui
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -Dm555 Desktop-Bridge $out/bin/protonmail-bridge
|
runHook preInstall
|
||||||
|
|
||||||
|
install -Dm555 proton-bridge $out/bin/protonmail-bridge
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/ProtonMail/proton-bridge";
|
homepage = "https://github.com/ProtonMail/proton-bridge";
|
||||||
changelog = "https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md";
|
changelog = "https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md";
|
||||||
downloadPage = "https://github.com/ProtonMail/proton-bridge/releases";
|
downloadPage = "https://github.com/ProtonMail/proton-bridge/releases";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ lightdiscord ];
|
maintainers = with maintainers; [ lightdiscord ];
|
||||||
description = "Use your ProtonMail account with your local e-mail client";
|
description = "Use your ProtonMail account with your local e-mail client";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, genericUpdater
|
, genericUpdater
|
||||||
, common-updater-scripts
|
, common-updater-scripts
|
||||||
|
, makeWrapper
|
||||||
|
, openssh
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
|
@ -31,6 +33,12 @@ buildGoModule rec {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram $out/bin/agent --prefix PATH : ${lib.makeBinPath [ openssh ]}
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description =
|
description =
|
||||||
"Enables easy access any Linux device behind firewall and NAT";
|
"Enables easy access any Linux device behind firewall and NAT";
|
||||||
|
|
|
@ -742,11 +742,11 @@
|
||||||
md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
|
md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "Python-3.8.4.tar.xz";
|
name = "Python-3.8.8rc1.tar.xz";
|
||||||
url = "https://dev-www.libreoffice.org/src/Python-3.8.4.tar.xz";
|
url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz";
|
||||||
sha256 = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37";
|
sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6";
|
||||||
md5 = "";
|
md5 = "";
|
||||||
md5name = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37-Python-3.8.4.tar.xz";
|
md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "QR-Code-generator-1.4.0.tar.gz";
|
name = "QR-Code-generator-1.4.0.tar.gz";
|
||||||
|
|
|
@ -8,7 +8,7 @@ rec {
|
||||||
|
|
||||||
major = "7";
|
major = "7";
|
||||||
minor = "1";
|
minor = "1";
|
||||||
patch = "1";
|
patch = "2";
|
||||||
tweak = "2";
|
tweak = "2";
|
||||||
|
|
||||||
subdir = "${major}.${minor}.${patch}";
|
subdir = "${major}.${minor}.${patch}";
|
||||||
|
@ -17,13 +17,13 @@ rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||||
sha256 = "1vz028hzbc4n8jznigs419ygylz1vp426dprrkm62bzckv2p1rfn";
|
sha256 = "1y19p9701msf6jjzp9d5ighvmyjzj68qzhm2bk3l5p16ys8qk9bb";
|
||||||
};
|
};
|
||||||
|
|
||||||
# FIXME rename
|
# FIXME rename
|
||||||
translations = fetchSrc {
|
translations = fetchSrc {
|
||||||
name = "translations";
|
name = "translations";
|
||||||
sha256 = "1vidv8077f394zn87b2ng1hsld0hgr1zb1p9lmjx0n9k7s7clavh";
|
sha256 = "1j5251lbc35d521d92w52lgps0v5pg8mhr8y3r6x2nl9p0gvw957";
|
||||||
};
|
};
|
||||||
|
|
||||||
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
||||||
|
@ -31,6 +31,6 @@ rec {
|
||||||
|
|
||||||
help = fetchSrc {
|
help = fetchSrc {
|
||||||
name = "help";
|
name = "help";
|
||||||
sha256 = "14wn0lvvplsj194jdqqv184xx0adb4mm8bjflddvcqsl7xsfqx27";
|
sha256 = "1bsrkmzhhpyrmi7akmdfvz4zb543fc093az9965k14rp8l6rhnvf";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
34
pkgs/applications/radio/ubertooth/default.nix
Normal file
34
pkgs/applications/radio/ubertooth/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libbtbb, libpcap , libusb1, bluez
|
||||||
|
, udevGroup ? "ubertooth"
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "ubertooth";
|
||||||
|
version = "2020-12-R1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "greatscottgadgets";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "11r5ag2l5xn4pr7ycicm30w9c3ldn9yiqj1sqnjc79csxl2vrcfw";
|
||||||
|
};
|
||||||
|
|
||||||
|
sourceRoot = "source/host";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
buildInputs = [ libbtbb libpcap libusb1 bluez ];
|
||||||
|
|
||||||
|
cmakeFlags = lib.optionals stdenv.isLinux [
|
||||||
|
"-DINSTALL_UDEV_RULES=TRUE"
|
||||||
|
"-DUDEV_RULES_PATH=etc/udev/rules.d"
|
||||||
|
"-DUDEV_RULES_GROUP=${udevGroup}"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Open source wireless development platform suitable for Bluetooth experimentation";
|
||||||
|
homepage = "https://github.com/greatscottgadgets/ubertooth";
|
||||||
|
license = licenses.gpl2;
|
||||||
|
maintainers = with maintainers; [ oxzi ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,34 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonApplication
|
||||||
|
, fetchPypi
|
||||||
|
, annexremote
|
||||||
|
, drivelib
|
||||||
|
, GitPython
|
||||||
|
, tenacity
|
||||||
|
, humanfriendly
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonApplication rec {
|
||||||
|
pname = "git-annex-remote-googledrive";
|
||||||
|
version = "1.3.0";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "118w0fyy6pck8hyj925ym6ak0xxqhkaq2vharnpl9b97nab4mqg8";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ annexremote drivelib GitPython tenacity humanfriendly ];
|
||||||
|
|
||||||
|
# while git-annex does come with a testremote command that *could* be used,
|
||||||
|
# testing this special remote obviously depends on authenticating with google
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "git_annex_remote_googledrive" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A git-annex special remote for Google Drive";
|
||||||
|
homepage = "https://pypi.org/project/git-annex-remote-googledrive/";
|
||||||
|
license = licenses.gpl3Only;
|
||||||
|
maintainers = with maintainers; [ gravndal ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, kodi, bzip2, zlib }:
|
||||||
|
|
||||||
|
buildKodiBinaryAddon rec {
|
||||||
|
pname = "inputstream-ffmpegdirect";
|
||||||
|
namespace = "inputstream.ffmpegdirect";
|
||||||
|
version = "1.19.4";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "xbmc";
|
||||||
|
repo = "inputstream.ffmpegdirect";
|
||||||
|
rev = "${version}-${rel}";
|
||||||
|
sha256 = "1ppvs6zybbi73zq1qh8klyhj99byh61c6nijmb1gd5yhg7cywf72";
|
||||||
|
};
|
||||||
|
|
||||||
|
extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/xbmc/inputstream.ffmpegdirect/";
|
||||||
|
description = "InputStream Client for streams that can be opened by either FFmpeg's libavformat or Kodi's cURL";
|
||||||
|
platforms = platforms.all;
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
maintainers = teams.kodi.members;
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, openssl, rtmpdump, zlib }:
|
||||||
|
|
||||||
|
buildKodiBinaryAddon rec {
|
||||||
|
pname = "inputstream-rtmp";
|
||||||
|
namespace = "inputstream.rtmp";
|
||||||
|
version = "3.4.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "xbmc";
|
||||||
|
repo = "inputstream.rtmp";
|
||||||
|
rev = "${version}-${rel}";
|
||||||
|
sha256 = "1q4k6plkjasnjs7gnbcc1x2mwr562ach7bkqk1z1y343s0dp9qnq";
|
||||||
|
};
|
||||||
|
|
||||||
|
extraBuildInputs = [ openssl rtmpdump zlib ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/xbmc/inputstream.rtmp/";
|
||||||
|
description = "Client for RTMP streams";
|
||||||
|
platforms = platforms.all;
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
maintainers = teams.kodi.members;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,17 +1,29 @@
|
||||||
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, zlib, pugixml }:
|
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub
|
||||||
|
, pugixml, zlib
|
||||||
|
, inputstream-adaptive, inputstream-ffmpegdirect, inputstream-rtmp
|
||||||
|
}:
|
||||||
|
|
||||||
buildKodiBinaryAddon rec {
|
buildKodiBinaryAddon rec {
|
||||||
pname = "pvr-iptvsimple";
|
pname = "pvr-iptvsimple";
|
||||||
namespace = "pvr.iptvsimple";
|
namespace = "pvr.iptvsimple";
|
||||||
version = "7.4.2";
|
version = "7.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kodi-pvr";
|
owner = "kodi-pvr";
|
||||||
repo = "pvr.iptvsimple";
|
repo = "pvr.iptvsimple";
|
||||||
rev = "${version}-${rel}";
|
rev = "${version}-${rel}";
|
||||||
sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
|
sha256 = "1q470v9nipnrca0rbwvqlbxw9ccbl9s1k46hwwrh94vhyp5rjlib";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraBuildInputs = [ zlib pugixml ];
|
extraBuildInputs = [
|
||||||
|
pugixml
|
||||||
|
zlib
|
||||||
|
];
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
inputstream-adaptive
|
||||||
|
inputstream-ffmpegdirect
|
||||||
|
inputstream-rtmp
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
|
homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
|
||||||
|
|
|
@ -230,6 +230,7 @@ in stdenv.mkDerivation {
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
pythonPackages = python3Packages;
|
pythonPackages = python3Packages;
|
||||||
|
ffmpeg = ffmpeg;
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
29
pkgs/data/fonts/curie/default.nix
Normal file
29
pkgs/data/fonts/curie/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
{ lib, fetchurl }:
|
||||||
|
|
||||||
|
let
|
||||||
|
version = "1.0";
|
||||||
|
in fetchurl rec {
|
||||||
|
name = "curie-${version}";
|
||||||
|
|
||||||
|
url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz";
|
||||||
|
|
||||||
|
downloadToTemp = true;
|
||||||
|
|
||||||
|
recursiveHash = true;
|
||||||
|
|
||||||
|
sha256 = "sha256-twPAzsbTveYW0rQd7FYZz5AMZgvPbNmn5c7Nfzn7B0A=";
|
||||||
|
|
||||||
|
postFetch = ''
|
||||||
|
tar xzf $downloadedFile
|
||||||
|
mkdir -p $out/share/fonts/misc
|
||||||
|
install *.otb $out/share/fonts/misc
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "An upscaled version of scientifica";
|
||||||
|
homepage = "https://github.com/NerdyPepper/curie";
|
||||||
|
license = licenses.ofl;
|
||||||
|
platforms = platforms.all;
|
||||||
|
maintainers = with maintainers; [ fortuneteller2k ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,31 @@
|
||||||
|
{ lib, stdenv, fetchFromGitHub }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "gnome-shell-extension-disable-unredirect";
|
||||||
|
version = "unstable-2021-01-17";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "kazysmaster";
|
||||||
|
repo = "gnome-shell-extension-disable-unredirect";
|
||||||
|
rev = "2ecb2f489ea3316b77d04f03a0c885f322c67e79";
|
||||||
|
sha256 = "1rjyrg8qya0asndxr7189a9npww0rcxk02wkxrxjy7fdp5m89p7y";
|
||||||
|
};
|
||||||
|
|
||||||
|
uuid = "unredirect@vaina.lt";
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/share/gnome-shell/extensions
|
||||||
|
cp -R ${uuid} $out/share/gnome-shell/extensions/${uuid}
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Disables unredirect fullscreen windows in gnome-shell to avoid tearing";
|
||||||
|
license = licenses.gpl3Only;
|
||||||
|
homepage = "https://github.com/kazysmaster/gnome-shell-extension-disable-unredirect";
|
||||||
|
maintainers = with maintainers; [ eduardosm ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -118,6 +118,10 @@ stdenv.mkDerivation rec {
|
||||||
patchShebangs build-aux/yaml_to_json.py
|
patchShebangs build-aux/yaml_to_json.py
|
||||||
|
|
||||||
chmod +x desktop/geary-attach
|
chmod +x desktop/geary-attach
|
||||||
|
|
||||||
|
# Drop test that breaks after webkitgtk 2.32.0 update
|
||||||
|
# https://gitlab.gnome.org/GNOME/geary/-/issues/1180
|
||||||
|
sed -i '/add_test("edit_context_font", edit_context_font);/d' test/js/composer-page-state-test.vala
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
|
@ -8,7 +8,7 @@ let
|
||||||
pname = "clang";
|
pname = "clang";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch "clang" "1xg2wy86zdj1d4h33n9mmb4j0x8bp9a5pk4qnnx3imlh8n6vhrqj";
|
src = fetch "clang" "11ay72f81ffygil5ficq7mzplck4gffm77p0yj4ib3dgiqbb1qbw";
|
||||||
inherit clang-tools-extra_src;
|
inherit clang-tools-extra_src;
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
|
|
|
@ -11,7 +11,7 @@ in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "compiler-rt";
|
pname = "compiler-rt";
|
||||||
inherit version;
|
inherit version;
|
||||||
src = fetch pname "1n4jf0clwj3q0vfc7xjl0k4dqj69fvgsmib8qdqh45imgamnypvb";
|
src = fetch pname "01dvir3858qkjmqhw2h6jjagq0la0kasnwzqbyv91yixnwx8369z";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake python3 llvm ];
|
nativeBuildInputs = [ cmake python3 llvm ];
|
||||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
|
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
release_version = "12.0.0";
|
release_version = "12.0.0";
|
||||||
candidate = "rc3"; # empty or "rcN"
|
candidate = "rc4"; # empty or "rcN"
|
||||||
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
|
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
|
||||||
version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
|
version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
|
||||||
targetConfig = stdenv.targetPlatform.config;
|
targetConfig = stdenv.targetPlatform.config;
|
||||||
|
@ -18,7 +18,7 @@ let
|
||||||
inherit sha256;
|
inherit sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
clang-tools-extra_src = fetch "clang-tools-extra" "1p6ln69iciwwpng226mfvxf3vylfvbz73y0a4y4v2rg7pn7hk671";
|
clang-tools-extra_src = fetch "clang-tools-extra" "1m1qga8m967bzqkxwx9xqkw1lkxi9dhlrn6km2k7g2yqyb6k14ag";
|
||||||
|
|
||||||
tools = lib.makeExtensible (tools: let
|
tools = lib.makeExtensible (tools: let
|
||||||
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
|
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
|
||||||
|
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
||||||
pname = "libc++";
|
pname = "libc++";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch "libcxx" "1114yvbipwdk1qk1xrb7s05hf7cycyknpf4ph0wbqpjzzzxk0hgk";
|
src = fetch "libcxx" "0ai91zls1738502c3b2frhawmjpi73rm3m677hh540wrjp3xv0ql";
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
unpackFile ${libcxxabi.src}
|
unpackFile ${libcxxabi.src}
|
||||||
|
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
||||||
pname = "libc++abi";
|
pname = "libc++abi";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch "libcxxabi" "1vdc6zld5rlbrbpxf0fxs0m6k1cabpi82ksiwgj1pmhx8l140n0q";
|
src = fetch "libcxxabi" "02qp6ndagq7n48p53z93d1rrx0v0v4rsahd4vkv5frid0vm4ah9h";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake python3 ];
|
nativeBuildInputs = [ cmake python3 ];
|
||||||
buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
|
buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
|
||||||
|
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||||
pname = "libunwind";
|
pname = "libunwind";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch pname "18n3k2kf6pyvzspnz1i22czbgi14kmch76fxml8kvhky7mw7v1yz";
|
src = fetch pname "1a5db1lxw98a430b8mnaclc0w98y6cc8k587kgjhn0nghl40l40i";
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
unpackFile ${libcxx.src}
|
unpackFile ${libcxx.src}
|
||||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||||
pname = "lld";
|
pname = "lld";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch pname "097pxd7hgipr538vi48q8fi5svbd03bx3d078a06wigmvb7kzvw1";
|
src = fetch pname "0r9pxhvinipirv9s5k8fnsnqd30zfniwqjkvw5sac3lq29rn2lp1";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ llvm libxml2 ];
|
buildInputs = [ llvm libxml2 ];
|
||||||
|
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
|
||||||
pname = "lldb";
|
pname = "lldb";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch pname "077fli9l0fg4kpa5l9vrj810s13ajs15d745lg4l8kmjkbw7p3yh";
|
src = fetch pname "0943gan83mldizwbhksd07w4h90z4djjpv5f8v49caz8y9113svg";
|
||||||
|
|
||||||
patches = [ ./lldb-procfs.patch ];
|
patches = [ ./lldb-procfs.patch ];
|
||||||
|
|
||||||
|
|
|
@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec {
|
||||||
pname = "llvm";
|
pname = "llvm";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch pname "1lpdkndjb8cxpcyjv9glqp58687j8y8cvd7r72pw6sbqkkzq86g5";
|
src = fetch pname "1jif65i165h41cfcsfvfjy5k1yrnikg61assj5vs0f25pv1vbyvf";
|
||||||
polly_src = fetch "polly" "002a8q3lgspvqdb8fi09cl11x438x6a2d2sb026jargrx92i5vas";
|
polly_src = fetch "polly" "0hk6j6rsal3zsp1f9fla71yzbwmzz9007m63x22hy7qfiwyplvf2";
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
unpackFile $src
|
unpackFile $src
|
||||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||||
pname = "openmp";
|
pname = "openmp";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch pname "0kw1g7ndvwi0g7lx5d55mp81h9vffxz820l9r2wjdvvfs3dsyq05";
|
src = fetch pname "07g2rsfhli3szv3chzy6y37p2176ywdb6w3k2fv9g2r416cpxjdz";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake perl ];
|
nativeBuildInputs = [ cmake perl ];
|
||||||
buildInputs = [ llvm ];
|
buildInputs = [ llvm ];
|
||||||
|
|
|
@ -5360,6 +5360,7 @@ broken-packages:
|
||||||
- forest
|
- forest
|
||||||
- forest-fire
|
- forest-fire
|
||||||
- Forestry
|
- Forestry
|
||||||
|
- forex2ledger
|
||||||
- forger
|
- forger
|
||||||
- ForkableT
|
- ForkableT
|
||||||
- formal
|
- formal
|
||||||
|
@ -5377,6 +5378,7 @@ broken-packages:
|
||||||
- forth-hll
|
- forth-hll
|
||||||
- Fortnite-Hack-Cheats-Free-V-Bucks-Generator
|
- Fortnite-Hack-Cheats-Free-V-Bucks-Generator
|
||||||
- fortran-src
|
- fortran-src
|
||||||
|
- fortran-src-extras
|
||||||
- fortytwo
|
- fortytwo
|
||||||
- foscam-directory
|
- foscam-directory
|
||||||
- foscam-filename
|
- foscam-filename
|
||||||
|
@ -7301,6 +7303,7 @@ broken-packages:
|
||||||
- json-pointer-hasql
|
- json-pointer-hasql
|
||||||
- json-pointy
|
- json-pointy
|
||||||
- json-python
|
- json-python
|
||||||
|
- json-query
|
||||||
- json-rpc-client
|
- json-rpc-client
|
||||||
- json-schema
|
- json-schema
|
||||||
- json-sop
|
- json-sop
|
||||||
|
@ -8592,6 +8595,7 @@ broken-packages:
|
||||||
- OpenAFP
|
- OpenAFP
|
||||||
- OpenAFP-Utils
|
- OpenAFP-Utils
|
||||||
- openai-hs
|
- openai-hs
|
||||||
|
- openai-servant
|
||||||
- openapi-petstore
|
- openapi-petstore
|
||||||
- openapi-typed
|
- openapi-typed
|
||||||
- openapi3
|
- openapi3
|
||||||
|
@ -8999,7 +9003,11 @@ broken-packages:
|
||||||
- polydata-core
|
- polydata-core
|
||||||
- polynomial
|
- polynomial
|
||||||
- polysemy-chronos
|
- polysemy-chronos
|
||||||
|
- polysemy-conc
|
||||||
- polysemy-http
|
- polysemy-http
|
||||||
|
- polysemy-log
|
||||||
|
- polysemy-log-co
|
||||||
|
- polysemy-log-di
|
||||||
- polysemy-methodology
|
- polysemy-methodology
|
||||||
- polysemy-methodology-composite
|
- polysemy-methodology-composite
|
||||||
- polysemy-optics
|
- polysemy-optics
|
||||||
|
@ -10066,6 +10074,7 @@ broken-packages:
|
||||||
- signable
|
- signable
|
||||||
- signals
|
- signals
|
||||||
- signed-multiset
|
- signed-multiset
|
||||||
|
- signify-hs
|
||||||
- silkscreen
|
- silkscreen
|
||||||
- silvi
|
- silvi
|
||||||
- simd
|
- simd
|
||||||
|
@ -10563,6 +10572,7 @@ broken-packages:
|
||||||
- swf
|
- swf
|
||||||
- swift-lda
|
- swift-lda
|
||||||
- swiss-ephemeris
|
- swiss-ephemeris
|
||||||
|
- switch
|
||||||
- sws
|
- sws
|
||||||
- syb-extras
|
- syb-extras
|
||||||
- syb-with-class-instances-text
|
- syb-with-class-instances-text
|
||||||
|
@ -11826,6 +11836,7 @@ broken-packages:
|
||||||
- zoom-cache-pcm
|
- zoom-cache-pcm
|
||||||
- zoom-cache-sndfile
|
- zoom-cache-sndfile
|
||||||
- zoom-refs
|
- zoom-refs
|
||||||
|
- zoovisitor
|
||||||
- zsdd
|
- zsdd
|
||||||
- zsh-battery
|
- zsh-battery
|
||||||
- zsyntax
|
- zsyntax
|
||||||
|
|
|
@ -2,17 +2,17 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "babashka";
|
pname = "babashka";
|
||||||
version = "0.2.10";
|
version = "0.3.1";
|
||||||
|
|
||||||
reflectionJson = fetchurl {
|
reflectionJson = fetchurl {
|
||||||
name = "reflection.json";
|
name = "reflection.json";
|
||||||
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
|
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
|
||||||
sha256 = "1c7f0z1hi0vcfz532r3fhr4c64jjqppf94idpa1jziz1dljkwk85";
|
sha256 = "0ar2ry07axgrmdb6nsc0786v1a1nwlyvapgxncaaympvn38qk8qf";
|
||||||
};
|
};
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||||
sha256 = "0j6k3vmdljf3bjmj5dywhxjmxcs1axscc8dlnw94g5rwf9bin0dn";
|
sha256 = "1fapkyq7fcgydy8sls6jzxagfkhgxhwp1rdvjqxdmqk4d82jwrh2";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
|
@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
|
||||||
description = "Package management framework for Ruby";
|
description = "Package management framework for Ruby";
|
||||||
homepage = "https://rubygems.org/";
|
homepage = "https://rubygems.org/";
|
||||||
license = with licenses; [ mit /* or */ ruby ];
|
license = with licenses; [ mit /* or */ ruby ];
|
||||||
maintainers = with maintainers; [ qyliss zimbatm ];
|
maintainers = with maintainers; [ zimbatm ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bctoolbox";
|
pname = "bctoolbox";
|
||||||
version = "4.4.34";
|
version = "4.5.1";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake bcunit ];
|
nativeBuildInputs = [ cmake bcunit ];
|
||||||
buildInputs = [ mbedtls ];
|
buildInputs = [ mbedtls ];
|
||||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
group = "BC";
|
group = "BC";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25";
|
sha256 = "1mm3v01jz2mp8vajsl45s23gw90zafbgg3br5n5yz03aan08f395";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Do not build static libraries
|
# Do not build static libraries
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "belcard";
|
pname = "belcard";
|
||||||
version = "4.4.34";
|
version = "4.5.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.linphone.org";
|
domain = "gitlab.linphone.org";
|
||||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||||
group = "BC";
|
group = "BC";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m";
|
sha256 = "14hkgwr2a9zw44v1s8xscqxa2mwin06jsxpwb3hflh9mp16ymfzv";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ bctoolbox belr ];
|
buildInputs = [ bctoolbox belr ];
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "belle-sip";
|
pname = "belle-sip";
|
||||||
version = "4.4.34";
|
version = "4.5.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.linphone.org";
|
domain = "gitlab.linphone.org";
|
||||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||||
group = "BC";
|
group = "BC";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z";
|
sha256 = "0d1wf0jv9lb0s6r49i9gz5nrx8jzpkx558hywll7idma9d0mr61p";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ antlr3_4 cmake ];
|
nativeBuildInputs = [ antlr3_4 cmake ];
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "belr";
|
pname = "belr";
|
||||||
version = "4.4.34";
|
version = "4.5.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.linphone.org";
|
domain = "gitlab.linphone.org";
|
||||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||||
group = "BC";
|
group = "BC";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h";
|
sha256 = "0m0s7g8d25nbnafbl76w9v3x7q4jhsypxmz1gg80pj7j34xc2dsd";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ bctoolbox ];
|
buildInputs = [ bctoolbox ];
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bzrtp";
|
pname = "bzrtp";
|
||||||
version = "4.4.34";
|
version = "4.5.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.linphone.org";
|
domain = "gitlab.linphone.org";
|
||||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||||
group = "BC";
|
group = "BC";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6";
|
sha256 = "1a500ncgznwha0j3c27ak3p4jh5jm6fnnb531k7c0a4i91745agj";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ bctoolbox sqlite ];
|
buildInputs = [ bctoolbox sqlite ];
|
||||||
|
|
|
@ -16,11 +16,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ldb";
|
pname = "ldb";
|
||||||
version = "2.2.0";
|
version = "2.3.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
|
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
|
||||||
sha256 = "0pxxb3sn9lignkf80kndd84shxqk9m2qwimz62gzb6khd4bvajqk";
|
sha256 = "0bcjj4gv48ddg44wyxpsvrs26xry6yy9x9k16qgz0bljs2rhilx4";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
22
pkgs/development/libraries/libbtbb/default.nix
Normal file
22
pkgs/development/libraries/libbtbb/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
{ stdenv, lib, fetchFromGitHub, cmake }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "libbtbb";
|
||||||
|
version = "2020-12-R1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "greatscottgadgets";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Bluetooth baseband decoding library";
|
||||||
|
homepage = "https://github.com/greatscottgadgets/libbtbb";
|
||||||
|
license = licenses.gpl2;
|
||||||
|
maintainers = with maintainers; [ oxzi ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -10,10 +10,8 @@
|
||||||
, cyrus_sasl
|
, cyrus_sasl
|
||||||
, doxygen
|
, doxygen
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, fetchurl
|
|
||||||
, ffmpeg_3
|
, ffmpeg_3
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
, git
|
|
||||||
, glib
|
, glib
|
||||||
, graphviz
|
, graphviz
|
||||||
, gtk2
|
, gtk2
|
||||||
|
@ -30,12 +28,11 @@
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, mbedtls
|
, mbedtls
|
||||||
, mediastreamer
|
, mediastreamer
|
||||||
, mediastreamer-openh264
|
|
||||||
, openldap
|
, openldap
|
||||||
, ortp
|
, ortp
|
||||||
, pango
|
, pango
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, python
|
, python3
|
||||||
, readline
|
, readline
|
||||||
, soci
|
, soci
|
||||||
, speex
|
, speex
|
||||||
|
@ -49,7 +46,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "liblinphone";
|
pname = "liblinphone";
|
||||||
version = "4.4.35";
|
version = "4.5.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.linphone.org";
|
domain = "gitlab.linphone.org";
|
||||||
|
@ -57,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||||
group = "BC";
|
group = "BC";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1sysr8wnf1kvq87h2ymr5qk9qcjapayvlmcmzcx3zxk8vhqp83d8";
|
sha256 = "05ybbxq2yqzy3f3vzq8c3szs3qr0zl64la53icpqnmfakwnps5gs";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Do not build static libraries
|
# Do not build static libraries
|
||||||
|
@ -67,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||||
# defined when liblinphone and linphone-desktop weren't separated yet, so some
|
# defined when liblinphone and linphone-desktop weren't separated yet, so some
|
||||||
# of them might not be needed for liblinphone alone.
|
# of them might not be needed for liblinphone alone.
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
(python.withPackages (ps: [ ps.pystache ps.six ]))
|
(python3.withPackages (ps: [ ps.pystache ps.six ]))
|
||||||
bcg729
|
bcg729
|
||||||
bctoolbox
|
bctoolbox
|
||||||
belcard
|
belcard
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lime";
|
pname = "lime";
|
||||||
version = "4.4.34";
|
version = "4.5.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.linphone.org";
|
domain = "gitlab.linphone.org";
|
||||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
group = "BC";
|
group = "BC";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z";
|
sha256 = "1fsldk7gxagxkbkzksz6dz8a8dmix1lxfy8nvvp0m355pzgqj6lb";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ bctoolbox soci belle-sip sqlite ];
|
buildInputs = [ bctoolbox soci belle-sip sqlite ];
|
||||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "End-to-end encryption library for instant messaging";
|
description = "End-to-end encryption library for instant messaging";
|
||||||
homepage = "http://www.linphone.org/technical-corner/lime";
|
homepage = "http://www.linphone.org/technical-corner/lime";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3Only;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ jluttine ];
|
maintainers = with maintainers; [ jluttine ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
, cmake
|
, cmake
|
||||||
, doxygen
|
, doxygen
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, fetchpatch
|
|
||||||
, ffmpeg_3
|
, ffmpeg_3
|
||||||
, glew
|
, glew
|
||||||
, gsm
|
, gsm
|
||||||
, intltool
|
, intltool
|
||||||
|
, lib
|
||||||
, libGL
|
, libGL
|
||||||
, libGLU
|
, libGLU
|
||||||
, libX11
|
, libX11
|
||||||
|
@ -24,16 +24,16 @@
|
||||||
, libvpx
|
, libvpx
|
||||||
, ortp
|
, ortp
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, python
|
, python3
|
||||||
, SDL
|
, SDL
|
||||||
, speex
|
, speex
|
||||||
, srtp
|
, srtp
|
||||||
, lib, stdenv
|
, stdenv
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mediastreamer2";
|
pname = "mediastreamer2";
|
||||||
version = "4.4.35";
|
version = "4.5.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.linphone.org";
|
domain = "gitlab.linphone.org";
|
||||||
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||||
group = "BC";
|
group = "BC";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "18qmg678m087k7qsaxwfcv2p875z2kpy91pqryiv955km40drl0g";
|
sha256 = "0aqma9834lzy1593qb9qwmzvzn50y6fzhmmg493jznf8977b0gsw";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||||
doxygen
|
doxygen
|
||||||
intltool
|
intltool
|
||||||
pkg-config
|
pkg-config
|
||||||
python
|
python3
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
|
description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
|
||||||
homepage = "http://www.linphone.org/technical-corner/mediastreamer2";
|
homepage = "http://www.linphone.org/technical-corner/mediastreamer2";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3Only;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ jluttine ];
|
maintainers = with maintainers; [ jluttine ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ortp";
|
pname = "ortp";
|
||||||
version = "4.4.34";
|
version = "4.5.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.linphone.org";
|
domain = "gitlab.linphone.org";
|
||||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||||
group = "BC";
|
group = "BC";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m";
|
sha256 = "1lc1j7wvkyp5lhcflq3h5y7n8aiwgwj84ffm81ggbsmavamgwkk7";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Do not build static libraries
|
# Do not build static libraries
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "qpdf";
|
pname = "qpdf";
|
||||||
version = "10.2.0";
|
version = "10.3.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qpdf";
|
owner = "qpdf";
|
||||||
repo = "qpdf";
|
repo = "qpdf";
|
||||||
rev = "release-qpdf-${version}";
|
rev = "release-qpdf-${version}";
|
||||||
sha256 = "sha256-KiO2iIrLLjPhHTiR/FKEGRJOhdVV2kcZK9sdyCqONC8=";
|
sha256 = "sha256-iZUJjr9e+d90XA8YEFFwyRR0HjgPgBi6V5gIpVQMcV8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ perl ];
|
nativeBuildInputs = [ perl ];
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
{ lib, fetchurl, buildDunePackage
|
|
||||||
, checkseum, bigarray-compat, optint
|
|
||||||
}:
|
|
||||||
|
|
||||||
buildDunePackage rec {
|
|
||||||
version = "1.2.0";
|
|
||||||
pname = "decompress";
|
|
||||||
|
|
||||||
minimumOCamlVersion = "4.07";
|
|
||||||
|
|
||||||
useDune2 = true;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
|
|
||||||
sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
|
|
||||||
};
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
|
|
||||||
# required hxd version is not available in nixpkgs
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Pure OCaml implementation of Zlib";
|
|
||||||
license = lib.licenses.mit;
|
|
||||||
maintainers = [ lib.maintainers.vbgl ];
|
|
||||||
homepage = "https://github.com/mirage/decompress";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -4,6 +4,8 @@ buildDunePackage rec {
|
||||||
pname = "gsl";
|
pname = "gsl";
|
||||||
version = "1.24.3";
|
version = "1.24.3";
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
minimumOCamlVersion = "4.08";
|
minimumOCamlVersion = "4.08";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
|
|
@ -4,14 +4,14 @@
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
minimumOCamlVersion = "4.07";
|
minimumOCamlVersion = "4.07";
|
||||||
version = "20200929";
|
version = "20210402";
|
||||||
pname = "imagelib";
|
pname = "imagelib";
|
||||||
|
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/ocaml-imagelib_${version}/imagelib-ocaml-imagelib_${version}.tbz";
|
url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz";
|
||||||
sha256 = "1wyq4xxj0dxwafbcmd7jylsd8w1gbyl7j4ak6jbq1n0ardwmpwca";
|
sha256 = "b3c8ace02b10b36b6c60b3ce3ae0b9109d4a861916ec320c59cc1194f4cc86e3";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ decompress stdlib-shims ];
|
propagatedBuildInputs = [ decompress stdlib-shims ];
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
, asyncssh
|
, asyncssh
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, pytest-asyncio
|
, pytest-asyncio
|
||||||
, pytest-mock
|
, pytest-mock
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
@ -10,24 +9,18 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aioasuswrt";
|
pname = "aioasuswrt";
|
||||||
version = "1.3.2";
|
version = "1.3.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kennedyshead";
|
owner = "kennedyshead";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "V${version}";
|
rev = "V${version}";
|
||||||
sha256 = "0bzl11224vny4p9vhi1n5s9p04kfavdzs9xkq5qimbisz9sg4ysj";
|
sha256 = "1h1qwc7szgrcwiz4q6x4mlf26is20lj1ds5rcb9i611j26656v6d";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
# Remove pytest-runner, https://github.com/kennedyshead/aioasuswrt/pull/63
|
|
||||||
url = "https://github.com/kennedyshead/aioasuswrt/pull/63/commits/e7923927648d5d8daccac1716db86db2a45fcb34.patch";
|
|
||||||
sha256 = "09xzs3hjr3133li6b7lr58n090r00kaxi9hx1fms2zn0ai4xwp9d";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace "cryptography==3.3.2" "cryptography"
|
||||||
substituteInPlace setup.cfg \
|
substituteInPlace setup.cfg \
|
||||||
--replace "--cov-report html" "" \
|
--replace "--cov-report html" "" \
|
||||||
--replace "--cov-report term-missing" ""
|
--replace "--cov-report term-missing" ""
|
||||||
|
|
37
pkgs/development/python-modules/drivelib/default.nix
Normal file
37
pkgs/development/python-modules/drivelib/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonApplication
|
||||||
|
, fetchPypi
|
||||||
|
, expiringdict
|
||||||
|
, google-auth-httplib2
|
||||||
|
, google-auth-oauthlib
|
||||||
|
, google-api-python-client
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonApplication rec {
|
||||||
|
pname = "drivelib";
|
||||||
|
version = "0.3.0";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "1bz3dn6wm9mlm2w8czwjmhvf3ws3iggr57hvd8z8acl1qafr2g4m";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
google-api-python-client
|
||||||
|
google-auth-oauthlib
|
||||||
|
google-auth-httplib2
|
||||||
|
expiringdict
|
||||||
|
];
|
||||||
|
|
||||||
|
# tests depend on a google auth token
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "drivelib" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Easy access to the most common Google Drive API calls";
|
||||||
|
homepage = "https://pypi.org/project/drivelib/";
|
||||||
|
license = licenses.gpl3Only;
|
||||||
|
maintainers = with maintainers; [ gravndal ];
|
||||||
|
};
|
||||||
|
}
|
44
pkgs/development/python-modules/expiringdict/default.nix
Normal file
44
pkgs/development/python-modules/expiringdict/default.nix
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonApplication
|
||||||
|
, fetchFromGitHub
|
||||||
|
, dill
|
||||||
|
, coverage
|
||||||
|
, coveralls
|
||||||
|
, mock
|
||||||
|
, nose
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonApplication rec {
|
||||||
|
pname = "expiringdict";
|
||||||
|
version = "1.2.1";
|
||||||
|
|
||||||
|
# use fetchFromGitHub instead of fetchPypi because the test suite of
|
||||||
|
# the package is not included into the PyPI tarball
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mailgun";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "07g1vxznmim78bankfl9brr01s31sksdcpwynq1yryh6xw9ri5xs";
|
||||||
|
};
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
dill
|
||||||
|
coverage
|
||||||
|
coveralls
|
||||||
|
mock
|
||||||
|
nose
|
||||||
|
];
|
||||||
|
|
||||||
|
checkPhase = ''
|
||||||
|
nosetests -v --with-coverage --cover-package=expiringdict
|
||||||
|
'';
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "expiringdict" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Dictionary with auto-expiring values for caching purposes";
|
||||||
|
homepage = "https://pypi.org/project/expiringdict/";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ gravndal ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -15,11 +15,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "knack";
|
pname = "knack";
|
||||||
version = "0.7.2";
|
version = "0.8.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "dfc6aef6760ea9a9620577e01540617678d78cab3111a0f03e8b9f987d0f08ca";
|
sha256 = "16aa47240add6badd933a0b27576f3c090d7469177dc941e3ece05ca88123199";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -11,16 +11,22 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "privacyIDEA";
|
pname = "privacyIDEA";
|
||||||
version = "3.5.1";
|
version = "3.5.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-XJnrrpU0x2Axu7W4G3oDTjSJuqEyh3C/0Aga5D0gw9k=";
|
sha256 = "sha256-k2om2LjkFRCT53ECPAJEztCiMdz4fF5eoipVUvSoyGo=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Subset of https://github.com/privacyidea/privacyidea/commit/359db6dd10212b8a210e0a83536e92e9e796a1f8,
|
||||||
|
# fixes app context errors in tests. Can be removed on the next bump.
|
||||||
|
./fix-tests.patch
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
cryptography pyrad pymysql python-dateutil flask-versioned flask_script
|
cryptography pyrad pymysql python-dateutil flask-versioned flask_script
|
||||||
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
|
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
|
||||||
|
@ -36,6 +42,7 @@ buildPythonPackage rec {
|
||||||
"AESHardwareSecurityModuleTestCase"
|
"AESHardwareSecurityModuleTestCase"
|
||||||
"test_01_cert_request"
|
"test_01_cert_request"
|
||||||
"test_01_loading_scripts"
|
"test_01_loading_scripts"
|
||||||
|
"test_02_api_push_poll"
|
||||||
"test_02_cert_enrolled"
|
"test_02_cert_enrolled"
|
||||||
"test_02_enroll_rights"
|
"test_02_enroll_rights"
|
||||||
"test_02_get_resolvers"
|
"test_02_get_resolvers"
|
||||||
|
|
28
pkgs/development/python-modules/privacyidea/fix-tests.patch
Normal file
28
pkgs/development/python-modules/privacyidea/fix-tests.patch
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
diff --git a/privacyidea/lib/resolvers/LDAPIdResolver.py b/privacyidea/lib/resolvers/LDAPIdResolver.py
|
||||||
|
index ae9d87764..cfc609931 100644
|
||||||
|
--- a/privacyidea/lib/resolvers/LDAPIdResolver.py
|
||||||
|
+++ b/privacyidea/lib/resolvers/LDAPIdResolver.py
|
||||||
|
@@ -97,11 +97,6 @@
|
||||||
|
SERVERPOOL_ROUNDS = 2
|
||||||
|
# The number of seconds a non-responding server is removed from the server pool
|
||||||
|
SERVERPOOL_SKIP = 30
|
||||||
|
-# The number of seconds that ldap3 waits if no server is left in the pool, before
|
||||||
|
-# starting the next round
|
||||||
|
-pooling_loop_timeout = get_app_config_value("PI_LDAP_POOLING_LOOP_TIMEOUT", 10)
|
||||||
|
-log.info("Setting system wide POOLING_LOOP_TIMEOUT to {0!s}.".format(pooling_loop_timeout))
|
||||||
|
-ldap3.set_config_parameter("POOLING_LOOP_TIMEOUT", pooling_loop_timeout)
|
||||||
|
|
||||||
|
# 1 sec == 10^9 nano secs == 10^7 * (100 nano secs)
|
||||||
|
MS_AD_MULTIPLYER = 10 ** 7
|
||||||
|
@@ -314,6 +309,11 @@ def __init__(self):
|
||||||
|
self.serverpool_rounds = SERVERPOOL_ROUNDS
|
||||||
|
self.serverpool_skip = SERVERPOOL_SKIP
|
||||||
|
self.serverpool = None
|
||||||
|
+ # The number of seconds that ldap3 waits if no server is left in the pool, before
|
||||||
|
+ # starting the next round
|
||||||
|
+ pooling_loop_timeout = get_app_config_value("PI_LDAP_POOLING_LOOP_TIMEOUT", 10)
|
||||||
|
+ log.info("Setting system wide POOLING_LOOP_TIMEOUT to {0!s}.".format(pooling_loop_timeout))
|
||||||
|
+ ldap3.set_config_parameter("POOLING_LOOP_TIMEOUT", pooling_loop_timeout)
|
||||||
|
|
||||||
|
def checkPass(self, uid, password):
|
||||||
|
"""
|
|
@ -5,16 +5,17 @@
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, pyyaml
|
, pyyaml
|
||||||
|
, stdenv
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "yamllint";
|
pname = "yamllint";
|
||||||
version = "1.25.0";
|
version = "1.26.0";
|
||||||
disabled = pythonOlder "3.5";
|
disabled = pythonOlder "3.5";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "b1549cbe5b47b6ba67bdeea31720f5c51431a4d0c076c1557952d841f7223519";
|
sha256 = "11qhs1jk9pwvyk5k3q5blh9sq42dh1ywdf1f3i2zixf7hncwir5h";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -27,8 +28,13 @@ buildPythonPackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
# Test failure could be related to https://github.com/adrienverge/yamllint/issues/334
|
# test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373
|
||||||
"test_find_files_recursively"
|
"test_find_files_recursively"
|
||||||
|
] ++ lib.optional stdenv.isDarwin [
|
||||||
|
# locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307
|
||||||
|
"test_locale_accents"
|
||||||
|
"test_locale_case"
|
||||||
|
"test_run_with_locale"
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "yamllint" ];
|
pythonImportsCheck = [ "yamllint" ];
|
||||||
|
|
|
@ -38,7 +38,7 @@ buildRubyGem rec {
|
||||||
'';
|
'';
|
||||||
homepage = "https://github.com/manveru/bundix";
|
homepage = "https://github.com/manveru/bundix";
|
||||||
license = "MIT";
|
license = "MIT";
|
||||||
maintainers = with lib.maintainers; [ manveru qyliss zimbatm ];
|
maintainers = with lib.maintainers; [ manveru zimbatm ];
|
||||||
platforms = lib.platforms.all;
|
platforms = lib.platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
40
pkgs/development/tools/async-profiler/default.nix
Normal file
40
pkgs/development/tools/async-profiler/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{ lib, stdenv, fetchFromGitHub, jdk8 }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "async-profiler";
|
||||||
|
version = "1.8.4";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jvm-profiling-tools";
|
||||||
|
repo = "async-profiler";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-R/TFElytq3mBG+jKjb7XlFUqpXBpSZGfbscUdg2vevE=";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ jdk8 ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
install -D "$src/profiler.sh" "$out/bin/async-profiler"
|
||||||
|
install -D build/jattach "$out/bin/jattach"
|
||||||
|
install -D build/libasyncProfiler.so "$out/lib/libasyncProfiler.so"
|
||||||
|
install -D -t "$out/share/java/" build/*.jar
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
fixupPhase = ''
|
||||||
|
substituteInPlace $out/bin/async-profiler \
|
||||||
|
--replace 'JATTACH=$SCRIPT_DIR/build/jattach' \
|
||||||
|
'JATTACH=${placeholder "out"}/bin/jattach' \
|
||||||
|
--replace 'PROFILER=$SCRIPT_DIR/build/libasyncProfiler.so' \
|
||||||
|
'PROFILER=${placeholder "out"}/lib/libasyncProfiler.so'
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A low overhead sampling profiler for Java that does not suffer from Safepoint bias problem";
|
||||||
|
homepage = "https://github.com/jvm-profiling-tools/async-profiler";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ mschuwalow ];
|
||||||
|
platforms = platforms.all;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,34 +1,39 @@
|
||||||
{ lib, stdenv, fetchFromGitHub }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, bison
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "boost-build";
|
pname = "boost-build";
|
||||||
version = "2016.03";
|
version = "4.4.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "boostorg";
|
owner = "boostorg";
|
||||||
repo = "build";
|
repo = "build";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1qw5marmp7z09nwcjlqrmqdg9b6myfqj3zvfz888x9mbidrmhn6p";
|
sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54";
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
nativeBuildInputs = [
|
||||||
|
bison
|
||||||
patchPhase = ''
|
];
|
||||||
grep -r '/usr/share/boost-build' \
|
|
||||||
| awk '{split($0,a,":"); print a[1];}' \
|
|
||||||
| xargs sed -i "s,/usr/share/boost-build,$out/share/boost-build,"
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
./b2 install --prefix=$out
|
runHook preInstall
|
||||||
|
./b2 install --prefix="$out"
|
||||||
|
ln -s b2 "$out/bin/bjam"
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://www.boost.org/boost-build2/";
|
homepage = "https://www.boost.org/build/";
|
||||||
license = lib.licenses.boost;
|
license = lib.licenses.boost;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ ivan-tkatchev ];
|
maintainers = with maintainers; [ ivan-tkatchev ];
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }:
|
{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }:
|
||||||
|
|
||||||
|
# libunwind does not have the supportsHost attribute on darwin, thus
|
||||||
|
# when this package is evaluated it causes an evaluation error
|
||||||
|
assert stdenv.isLinux;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "strace";
|
pname = "strace";
|
||||||
version = "5.11";
|
version = "5.11";
|
||||||
|
|
|
@ -1,12 +1,9 @@
|
||||||
{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
|
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||||
buildGoPackage rec {
|
|
||||||
|
buildGoModule rec {
|
||||||
pname = "packer";
|
pname = "packer";
|
||||||
version = "1.7.1";
|
version = "1.7.1";
|
||||||
|
|
||||||
goPackagePath = "github.com/hashicorp/packer";
|
|
||||||
|
|
||||||
subPackages = [ "." ];
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hashicorp";
|
owner = "hashicorp";
|
||||||
repo = "packer";
|
repo = "packer";
|
||||||
|
@ -14,12 +11,16 @@ buildGoPackage rec {
|
||||||
sha256 = "sha256-PZwKvb43Xf8HaC148Xo076u3sP53nwC4fJ2X7HU0gDo=";
|
sha256 = "sha256-PZwKvb43Xf8HaC148Xo076u3sP53nwC4fJ2X7HU0gDo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vendorSha256 = null;
|
||||||
|
|
||||||
|
subPackages = [ "." ];
|
||||||
|
|
||||||
buildFlagsArray = [ "-ldflags=-s -w" ];
|
buildFlagsArray = [ "-ldflags=-s -w" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
installShellCompletion --zsh go/src/${goPackagePath}/contrib/zsh-completion/_packer
|
installShellCompletion --zsh contrib/zsh-completion/_packer
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, fetchzip, pkg-config, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir
|
{ lib, stdenv, fetchurl, fetchzip, cmake, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir
|
||||||
, withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true
|
, withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true
|
||||||
, withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps
|
, withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps
|
||||||
, writeScriptBin, makeWrapper, runtimeShell
|
, writeScriptBin, makeWrapper, runtimeShell
|
||||||
|
@ -6,18 +6,18 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
opengfx = fetchzip {
|
opengfx = fetchzip {
|
||||||
url = "https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip";
|
url = "https://cdn.openttd.org/opengfx-releases/0.6.1/opengfx-0.6.1-all.zip";
|
||||||
sha256 = "1zg871j6kv7r0aqwca68d9kdf3smclgzan8hj76vj4fyfkykh173";
|
sha256 = "sha256-DeeIlLcmPeMZ0ju9DwXUInnQp2rWu60besDVto4+lDQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
opensfx = fetchzip {
|
opensfx = fetchzip {
|
||||||
url = "https://cdn.openttd.org/opensfx-releases/0.2.3/opensfx-0.2.3-all.zip";
|
url = "https://cdn.openttd.org/opensfx-releases/1.0.1/opensfx-1.0.1-all.zip";
|
||||||
sha256 = "1bb167kszdd6dqbcdjrxxwab6b7y7jilhzi3qijdhprpm5gf1lp3";
|
sha256 = "sha256-U1PIKbMZHRJ0Z9Cp2RqqCMhD1xRyudoNHAYIZyotxVk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
openmsx = fetchzip {
|
openmsx = fetchzip {
|
||||||
url = "https://cdn.openttd.org/openmsx-releases/0.3.1/openmsx-0.3.1-all.zip";
|
url = "https://cdn.openttd.org/openmsx-releases/0.4.0/openmsx-0.4.0-all.zip";
|
||||||
sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4";
|
sha256 = "sha256-Ok6W+iqi4SP7cD4HUQERrAysvVibnN7Q4/tkugffDgQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
playmidi = writeScriptBin "playmidi" ''
|
playmidi = writeScriptBin "playmidi" ''
|
||||||
|
@ -29,14 +29,14 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "openttd";
|
pname = "openttd";
|
||||||
version = "1.10.3";
|
version = "1.11.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
|
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
|
||||||
sha256 = "0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1";
|
sha256 = "sha256-XmUYTgc2i6Gvpi27PjWrrubE2mcw/0vJ60RH1TNjx6g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config which makeWrapper ];
|
nativeBuildInputs = [ cmake makeWrapper ];
|
||||||
buildInputs = [ SDL2 libpng xz zlib freetype fontconfig libxdg_basedir ]
|
buildInputs = [ SDL2 libpng xz zlib freetype fontconfig libxdg_basedir ]
|
||||||
++ lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ];
|
++ lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ];
|
||||||
|
|
||||||
|
@ -46,25 +46,21 @@ stdenv.mkDerivation rec {
|
||||||
"--without-liblzo2"
|
"--without-liblzo2"
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = [ "INSTALL_PERSONAL_DIR=" ];
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mv $out/games/ $out/bin
|
|
||||||
|
|
||||||
${lib.optionalString withOpenGFX ''
|
${lib.optionalString withOpenGFX ''
|
||||||
cp ${opengfx}/* $out/share/games/openttd/baseset
|
cp ${opengfx}/*.tar $out/share/games/openttd/baseset
|
||||||
''}
|
''}
|
||||||
|
|
||||||
mkdir -p $out/share/games/openttd/data
|
mkdir -p $out/share/games/openttd/data
|
||||||
|
|
||||||
${lib.optionalString withOpenSFX ''
|
${lib.optionalString withOpenSFX ''
|
||||||
cp ${opensfx}/*.{obs,cat} $out/share/games/openttd/data
|
cp ${opensfx}/*.tar $out/share/games/openttd/data
|
||||||
''}
|
''}
|
||||||
|
|
||||||
mkdir $out/share/games/openttd/baseset/openmsx
|
mkdir $out/share/games/openttd/baseset/openmsx
|
||||||
|
|
||||||
${lib.optionalString withOpenMSX ''
|
${lib.optionalString withOpenMSX ''
|
||||||
cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/baseset/openmsx
|
cp ${openmsx}/*.tar $out/share/games/openttd/baseset/openmsx
|
||||||
''}
|
''}
|
||||||
|
|
||||||
${lib.optionalString withFluidSynth ''
|
${lib.optionalString withFluidSynth ''
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
openttd.overrideAttrs (oldAttrs: rec {
|
openttd.overrideAttrs (oldAttrs: rec {
|
||||||
pname = "openttd-jgrpp";
|
pname = "openttd-jgrpp";
|
||||||
version = "0.34.4";
|
version = "0.40.5";
|
||||||
|
|
||||||
src = fetchFromGitHub rec {
|
src = fetchFromGitHub rec {
|
||||||
owner = "JGRennison";
|
owner = "JGRennison";
|
||||||
repo = "OpenTTD-patches";
|
repo = "OpenTTD-patches";
|
||||||
rev = "jgrpp-${version}";
|
rev = "jgrpp-${version}";
|
||||||
sha256 = "125mgia5hgcsn8314xyiip3z8y23rc3kdv7jczbncqlzsc75624v";
|
sha256 = "sha256-g1RmgVjefOrOVLTvFBiPEd19aLoFvB9yX/hMiKgGcGw=";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
|
||||||
CONFIG_HS20=y
|
CONFIG_HS20=y
|
||||||
CONFIG_ACS=y
|
CONFIG_ACS=y
|
||||||
CONFIG_GETRANDOM=y
|
CONFIG_GETRANDOM=y
|
||||||
|
CONFIG_SAE=y
|
||||||
'' + lib.optionalString (sqlite != null) ''
|
'' + lib.optionalString (sqlite != null) ''
|
||||||
CONFIG_SQLITE=y
|
CONFIG_SQLITE=y
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
{ pkgs, nodejs, stdenv, fetchFromGitHub, lib, ... }:
|
{ pkgs, nodejs, stdenv, fetchFromGitHub, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "matrix-org";
|
owner = "matrix-org";
|
||||||
repo = "matrix-appservice-slack";
|
repo = "matrix-appservice-slack";
|
||||||
rev = "1.4.0";
|
rev = "1.7.0";
|
||||||
sha256 = "1xm75rgg7yrz40y2w1njiwfwz17a8wwlvr7a6zyxvkl8cqrgzp6d";
|
sha256 = "sha256-0BcnG/DGvc3uh/eP0KIB5gPSpXNPlaAl78D4bVCnLHg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nodePackages = import ./node-composition.nix {
|
nodePackages = import ./node-composition.nix {
|
||||||
|
@ -25,7 +24,7 @@ nodePackages.package.override {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A Matrix <--> Slack bridge";
|
description = "A Matrix <--> Slack bridge";
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ beardhatcode ];
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#!/usr/bin/env nix-shell
|
#!/usr/bin/env nix-shell
|
||||||
#! nix-shell -i bash -p nodePackages.node2nix
|
#! nix-shell -i bash -p nodePackages.node2nix
|
||||||
|
|
||||||
# Download package.json and package-lock.json from the v1.4.0 release
|
# Download package.json and package-lock.json from the v1.7.0 release
|
||||||
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/9462a75715ea9afba23b757ec90554f10f457a96/package.json -o package.json
|
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package.json -o package.json
|
||||||
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/9462a75715ea9afba23b757ec90554f10f457a96/package-lock.json -o package-lock.json
|
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package-lock.json -o package-lock.json
|
||||||
|
|
||||||
node2nix \
|
node2nix \
|
||||||
--nodejs-12 \
|
--nodejs-12 \
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -216,6 +216,7 @@ in self: {
|
||||||
this = self.postgresql_10;
|
this = self.postgresql_10;
|
||||||
thisAttr = "postgresql_10";
|
thisAttr = "postgresql_10";
|
||||||
inherit self;
|
inherit self;
|
||||||
|
icu = self.icu67;
|
||||||
};
|
};
|
||||||
|
|
||||||
postgresql_11 = self.callPackage generic {
|
postgresql_11 = self.callPackage generic {
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
}:
|
}:
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "salt";
|
pname = "salt";
|
||||||
version = "3002.6";
|
version = "3003";
|
||||||
|
|
||||||
src = python3.pkgs.fetchPypi {
|
src = python3.pkgs.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "/8R4VpNj4dF7ajoMQh6q6cB5u+q8THcloiLQ+/kDoKU=";
|
sha256 = "xGiXM9/nOM8ofjHLP908uNFgYpUgKxjY5m1I03LVync=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "squashfs-tools-ng";
|
pname = "squashfs-tools-ng";
|
||||||
version = "1.0.4";
|
version = "1.1.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
|
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
|
||||||
sha256 = "04zvpws1nk3r2kr1k5in9di9fhn4zzciyndgnxnijmhiqpyrx072";
|
sha256 = "1swsw5j8rrjxdxsfyd446f6g8f0k3mwg15baivi953i69c9981qi";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ doxygen graphviz pkg-config perl ];
|
nativeBuildInputs = [ doxygen graphviz pkg-config perl ];
|
||||||
|
|
30
pkgs/tools/misc/quich/default.nix
Normal file
30
pkgs/tools/misc/quich/default.nix
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
{ lib, stdenv, fetchFromGitHub }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "quich";
|
||||||
|
version = "3.1.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "Usbac";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1n9c01q2v6g9wnmxp248yclhp8cxclnj0yyn1qrvjsn6srcpr22c";
|
||||||
|
};
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
makeFlags = [ "DESTDIR=" "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "The advanced terminal calculator";
|
||||||
|
longDescription = ''
|
||||||
|
Quich is a compact, fast, powerful and useful calculator for your terminal
|
||||||
|
with numerous features, supporting Windows and Linux Systems,
|
||||||
|
written in ANSI C.
|
||||||
|
'';
|
||||||
|
homepage = "https://github.com/Usbac/quich";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = [ maintainers.xdhampus ];
|
||||||
|
platforms = platforms.all;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,31 +1,40 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, protobuf
|
{ stdenv
|
||||||
, Security, libiconv, rdkafka, tzdata, coreutils, CoreServices
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
, features ?
|
, rustPlatform
|
||||||
([ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
|
, openssl
|
||||||
|
, pkg-config
|
||||||
|
, protobuf
|
||||||
|
, Security
|
||||||
|
, libiconv
|
||||||
|
, rdkafka
|
||||||
|
, tzdata
|
||||||
|
, coreutils
|
||||||
|
, CoreServices
|
||||||
|
, features ? ([ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
|
||||||
++ (lib.optional stdenv.targetPlatform.isUnix "unix")
|
++ (lib.optional stdenv.targetPlatform.isUnix "unix")
|
||||||
++ [ "sinks" "sources" "transforms" ])
|
++ [ "sinks" "sources" "transforms" ])
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "vector";
|
pname = "vector";
|
||||||
version = "0.12.1";
|
version = "0.12.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "timberio";
|
owner = "timberio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0sw05472znxmggckxjbrl3b8ky8nsw42xmrsb41p8z4q0aw115fd";
|
sha256 = "sha256-LutCzpJo47wvEze7bAObRVraNhVuQFc9NQ79NzKA9CM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "0mfhrdqry6qrzfx5px1zqgfv5iqa186vl2yh290ibinkxy0x5fa9";
|
cargoSha256 = "sha256-GU5p9DB5Bk8eQc1B/WA87grbVJVcT1ELJ0WzmRYgDzc=";
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ openssl protobuf rdkafka ]
|
buildInputs = [ openssl protobuf rdkafka ]
|
||||||
++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
|
++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
|
||||||
|
|
||||||
# needed for internal protobuf c wrapper library
|
# needed for internal protobuf c wrapper library
|
||||||
PROTOC="${protobuf}/bin/protoc";
|
PROTOC = "${protobuf}/bin/protoc";
|
||||||
PROTOC_INCLUDE="${protobuf}/include";
|
PROTOC_INCLUDE = "${protobuf}/include";
|
||||||
|
|
||||||
cargoBuildFlags = [ "--no-default-features" "--features" (lib.concatStringsSep "," features) ];
|
cargoBuildFlags = [ "--no-default-features" "--features" (lib.concatStringsSep "," features) ];
|
||||||
checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1";
|
checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1";
|
||||||
|
@ -54,8 +63,8 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A high-performance logs, metrics, and events router";
|
description = "A high-performance logs, metrics, and events router";
|
||||||
homepage = "https://github.com/timberio/vector";
|
homepage = "https://github.com/timberio/vector";
|
||||||
license = with licenses; [ asl20 ];
|
license = with licenses; [ asl20 ];
|
||||||
maintainers = with maintainers; [ thoughtpolice happysalada ];
|
maintainers = with maintainers; [ thoughtpolice happysalada ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ common =
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
[ pkg-config ]
|
[ pkg-config ]
|
||||||
++ lib.optionals (is24 && stdenv.isLinux) [ util-linuxMinimal ]
|
++ lib.optionals stdenv.isLinux [ util-linuxMinimal ]
|
||||||
++ lib.optionals is24
|
++ lib.optionals is24
|
||||||
[ autoreconfHook
|
[ autoreconfHook
|
||||||
autoconf-archive
|
autoconf-archive
|
||||||
|
|
|
@ -779,6 +779,8 @@ in
|
||||||
|
|
||||||
metapixel = callPackage ../tools/graphics/metapixel { };
|
metapixel = callPackage ../tools/graphics/metapixel { };
|
||||||
|
|
||||||
|
quich = callPackage ../tools/misc/quich { } ;
|
||||||
|
|
||||||
tfk8s = callPackage ../tools/misc/tfk8s { };
|
tfk8s = callPackage ../tools/misc/tfk8s { };
|
||||||
|
|
||||||
xtrt = callPackage ../tools/archivers/xtrt { };
|
xtrt = callPackage ../tools/archivers/xtrt { };
|
||||||
|
@ -1034,6 +1036,8 @@ in
|
||||||
|
|
||||||
async = callPackage ../development/tools/async {};
|
async = callPackage ../development/tools/async {};
|
||||||
|
|
||||||
|
async-profiler = callPackage ../development/tools/async-profiler { };
|
||||||
|
|
||||||
atheme = callPackage ../servers/irc/atheme { };
|
atheme = callPackage ../servers/irc/atheme { };
|
||||||
|
|
||||||
atinout = callPackage ../tools/networking/atinout { };
|
atinout = callPackage ../tools/networking/atinout { };
|
||||||
|
@ -3625,6 +3629,8 @@ in
|
||||||
|
|
||||||
cutensor = cutensor_cudatoolkit_10;
|
cutensor = cutensor_cudatoolkit_10;
|
||||||
|
|
||||||
|
curie = callPackage ../data/fonts/curie { };
|
||||||
|
|
||||||
curlFull = curl.override {
|
curlFull = curl.override {
|
||||||
ldapSupport = true;
|
ldapSupport = true;
|
||||||
};
|
};
|
||||||
|
@ -4422,6 +4428,8 @@ in
|
||||||
|
|
||||||
libbladeRF = callPackage ../development/libraries/libbladeRF { };
|
libbladeRF = callPackage ../development/libraries/libbladeRF { };
|
||||||
|
|
||||||
|
libbtbb = callPackage ../development/libraries/libbtbb { };
|
||||||
|
|
||||||
lp_solve = callPackage ../applications/science/math/lp_solve { };
|
lp_solve = callPackage ../applications/science/math/lp_solve { };
|
||||||
|
|
||||||
fastlane = callPackage ../tools/admin/fastlane { };
|
fastlane = callPackage ../tools/admin/fastlane { };
|
||||||
|
@ -4693,6 +4701,17 @@ in
|
||||||
humanfriendly;
|
humanfriendly;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
git-annex-remote-googledrive = callPackage ../applications/version-management/git-and-tools/git-annex-remote-googledrive {
|
||||||
|
inherit (python3Packages)
|
||||||
|
buildPythonApplication
|
||||||
|
fetchPypi
|
||||||
|
annexremote
|
||||||
|
drivelib
|
||||||
|
GitPython
|
||||||
|
tenacity
|
||||||
|
humanfriendly;
|
||||||
|
};
|
||||||
|
|
||||||
git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { };
|
git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { };
|
||||||
|
|
||||||
git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { };
|
git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { };
|
||||||
|
@ -8854,6 +8873,8 @@ in
|
||||||
|
|
||||||
ubridge = callPackage ../tools/networking/ubridge { };
|
ubridge = callPackage ../tools/networking/ubridge { };
|
||||||
|
|
||||||
|
ubertooth = callPackage ../applications/radio/ubertooth { };
|
||||||
|
|
||||||
ucl = callPackage ../development/libraries/ucl { };
|
ucl = callPackage ../development/libraries/ucl { };
|
||||||
|
|
||||||
ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { };
|
ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { };
|
||||||
|
@ -28103,6 +28124,7 @@ in
|
||||||
clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { };
|
clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { };
|
||||||
dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
|
dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
|
||||||
dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
|
dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
|
||||||
|
disable-unredirect = callPackage ../desktops/gnome-3/extensions/disable-unredirect { };
|
||||||
draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { };
|
draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { };
|
||||||
drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
|
drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
|
||||||
dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { };
|
dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { };
|
||||||
|
|
|
@ -106,6 +106,10 @@ let self = rec {
|
||||||
|
|
||||||
inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { };
|
inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { };
|
||||||
|
|
||||||
|
inputstream-ffmpegdirect = callPackage ../applications/video/kodi-packages/inputstream-ffmpegdirect { };
|
||||||
|
|
||||||
|
inputstream-rtmp = callPackage ../applications/video/kodi-packages/inputstream-rtmp { };
|
||||||
|
|
||||||
inputstreamhelper = callPackage ../applications/video/kodi-packages/inputstreamhelper { };
|
inputstreamhelper = callPackage ../applications/video/kodi-packages/inputstreamhelper { };
|
||||||
|
|
||||||
kodi-six = callPackage ../applications/video/kodi-packages/kodi-six { };
|
kodi-six = callPackage ../applications/video/kodi-packages/kodi-six { };
|
||||||
|
|
|
@ -238,8 +238,6 @@ let
|
||||||
|
|
||||||
decompress = callPackage ../development/ocaml-modules/decompress { };
|
decompress = callPackage ../development/ocaml-modules/decompress { };
|
||||||
|
|
||||||
decompress-1-2 = callPackage ../development/ocaml-modules/decompress/1.2.nix { };
|
|
||||||
|
|
||||||
diet = callPackage ../development/ocaml-modules/diet { };
|
diet = callPackage ../development/ocaml-modules/diet { };
|
||||||
|
|
||||||
digestif = callPackage ../development/ocaml-modules/digestif { };
|
digestif = callPackage ../development/ocaml-modules/digestif { };
|
||||||
|
@ -415,9 +413,7 @@ let
|
||||||
|
|
||||||
hxd = callPackage ../development/ocaml-modules/hxd { };
|
hxd = callPackage ../development/ocaml-modules/hxd { };
|
||||||
|
|
||||||
imagelib = callPackage ../development/ocaml-modules/imagelib {
|
imagelib = callPackage ../development/ocaml-modules/imagelib { };
|
||||||
decompress = decompress-1-2;
|
|
||||||
};
|
|
||||||
|
|
||||||
inotify = callPackage ../development/ocaml-modules/inotify { };
|
inotify = callPackage ../development/ocaml-modules/inotify { };
|
||||||
|
|
||||||
|
|
|
@ -2064,6 +2064,8 @@ in {
|
||||||
|
|
||||||
drf-yasg = callPackage ../development/python-modules/drf-yasg { };
|
drf-yasg = callPackage ../development/python-modules/drf-yasg { };
|
||||||
|
|
||||||
|
drivelib = callPackage ../development/python-modules/drivelib { };
|
||||||
|
|
||||||
drms = callPackage ../development/python-modules/drms { };
|
drms = callPackage ../development/python-modules/drms { };
|
||||||
|
|
||||||
dropbox = callPackage ../development/python-modules/dropbox { };
|
dropbox = callPackage ../development/python-modules/dropbox { };
|
||||||
|
@ -2240,6 +2242,8 @@ in {
|
||||||
|
|
||||||
exifread = callPackage ../development/python-modules/exifread { };
|
exifread = callPackage ../development/python-modules/exifread { };
|
||||||
|
|
||||||
|
expiringdict = callPackage ../development/python-modules/expiringdict { };
|
||||||
|
|
||||||
exrex = callPackage ../development/python-modules/exrex { };
|
exrex = callPackage ../development/python-modules/exrex { };
|
||||||
|
|
||||||
extras = callPackage ../development/python-modules/extras { };
|
extras = callPackage ../development/python-modules/extras { };
|
||||||
|
|
Loading…
Reference in a new issue