Merge branch 'staging-next' into staging
This commit is contained in:
worldofpeace
commit
504f8bffaa
|
|
@ -2796,9 +2796,14 @@
|
|||
name = "Graham Christensen";
|
||||
};
|
||||
grburst = {
|
||||
email = "grburst@openmailbox.org";
|
||||
github = "grburst";
|
||||
name = "Julius Elias";
|
||||
email = "GRBurst@protonmail.com";
|
||||
github = "GRBurst";
|
||||
githubId = 4647221;
|
||||
name = "GRBurst";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x797F623868CD00C2";
|
||||
fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2";
|
||||
}];
|
||||
};
|
||||
greydot = {
|
||||
email = "lanablack@amok.cc";
|
||||
|
|
@ -4294,6 +4299,16 @@
|
|||
githubId = 1784379;
|
||||
name = "Kyohei Kadota";
|
||||
};
|
||||
Luflosi = {
|
||||
name = "Luflosi";
|
||||
email = "luflosi@luflosi.de";
|
||||
github = "Luflosi";
|
||||
githubId = 15217907;
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x6F987CCF224D20B9";
|
||||
fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9";
|
||||
}];
|
||||
};
|
||||
luispedro = {
|
||||
email = "luis@luispedro.org";
|
||||
github = "luispedro";
|
||||
|
|
|
|||
|
|
@ -158,10 +158,10 @@ let
|
|||
(sec "addressbook")
|
||||
(strOpt "defaulturl" cfg.addressbook.defaulturl)
|
||||
] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions)
|
||||
++ (flip mapAttrs
|
||||
(collect (name: proto: proto ? port && proto ? address && proto ? name) cfg.proto)
|
||||
++ (flip map
|
||||
(collect (proto: proto ? port && proto ? address) cfg.proto)
|
||||
(proto: let protoOpts = [
|
||||
(sec name)
|
||||
(sec proto.name)
|
||||
(boolOpt "enabled" proto.enable)
|
||||
(strOpt "address" proto.address)
|
||||
(intOpt "port" proto.port)
|
||||
|
|
@ -181,10 +181,10 @@ let
|
|||
|
||||
tunnelConf = let opts = [
|
||||
notice
|
||||
(flip mapAttrs
|
||||
(collect (name: tun: tun ? port && tun ? destination) cfg.outTunnels)
|
||||
(flip map
|
||||
(collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
|
||||
(tun: let outTunOpts = [
|
||||
(sec name)
|
||||
(sec tun.name)
|
||||
"type = client"
|
||||
(intOpt "port" tun.port)
|
||||
(strOpt "destination" tun.destination)
|
||||
|
|
@ -204,10 +204,10 @@ let
|
|||
++ (if tun ? crypto.tagsToSend then
|
||||
optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []);
|
||||
in concatStringsSep "\n" outTunOpts))
|
||||
(flip mapAttrs
|
||||
(collect (name: tun: tun ? port && tun ? address) cfg.inTunnels)
|
||||
(flip map
|
||||
(collect (tun: tun ? port && tun ? address) cfg.inTunnels)
|
||||
(tun: let inTunOpts = [
|
||||
(sec name)
|
||||
(sec tun.name)
|
||||
"type = server"
|
||||
(intOpt "port" tun.port)
|
||||
(strOpt "host" tun.address)
|
||||
|
|
@ -606,7 +606,7 @@ in
|
|||
|
||||
outTunnels = mkOption {
|
||||
default = {};
|
||||
type = with types; loaOf (submodule (
|
||||
type = with types; attrsOf (submodule (
|
||||
{ name, ... }: {
|
||||
options = {
|
||||
destinationPort = mkOption {
|
||||
|
|
@ -627,7 +627,7 @@ in
|
|||
|
||||
inTunnels = mkOption {
|
||||
default = {};
|
||||
type = with types; loaOf (submodule (
|
||||
type = with types; attrsOf (submodule (
|
||||
{ name, ... }: {
|
||||
options = {
|
||||
inPort = mkOption {
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ in
|
|||
boot.initrd = {
|
||||
luks = {
|
||||
devices =
|
||||
map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs;
|
||||
builtins.listToAttrs (map (dev: { name = dev.encrypted.label; value = { device = dev.encrypted.blkDev; }; }) keylessEncDevs);
|
||||
forceLuksSupportInInitrd = true;
|
||||
};
|
||||
postMountCommands =
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ in import ./make-test-python.nix {
|
|||
systemd.services."acme-a.example.com" = {
|
||||
wants = [ "acme-finished-a.example.com.target" ];
|
||||
before = [ "acme-finished-a.example.com.target" ];
|
||||
after = [ "nginx.service" ];
|
||||
};
|
||||
|
||||
services.nginx.enable = true;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ import ./make-test-python.nix ({ lib, ...} : {
|
|||
testScript = ''
|
||||
nameserver.start()
|
||||
nameserver.wait_for_unit("tinydns.service")
|
||||
nameserver.succeed("host bla.foo.bar | grep '1\.2\.3\.4'")
|
||||
nameserver.succeed("host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
pythonPackages = python3Packages;
|
||||
in pythonPackages.buildPythonApplication rec {
|
||||
pname = "picard";
|
||||
version = "2.2.3";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metabrainz";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16";
|
||||
sha256 = "0msdnp6wh97lnm3m084jsvbp95h5d35y5fm71j64cgf4g39zp5ds";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clightning";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
|
||||
sha256 = "053e43bbe71564e9be8b2b56346a88986646ef6849a0af67cece01858b93306a";
|
||||
sha256 = "079d3yx7yr7qrilqgaayvn18lxl8h6a1gwwbsgm5xsyxj4vdlz7r";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-photos";
|
||||
version = "3.34.0";
|
||||
version = "3.34.1";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m";
|
||||
sha256 = "1ifm8hmxpf9nnxddfcpkbc5wc5f5hz43yj83nnakzqr6x1mq7gdp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -74,10 +74,12 @@ buildPythonApplication rec {
|
|||
})
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
./no-lto.patch
|
||||
./no-werror.patch
|
||||
./png2icns.patch
|
||||
];
|
||||
|
||||
# Causes build failure due to warning
|
||||
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
|
||||
|
||||
buildPhase = if stdenv.isDarwin then ''
|
||||
${python.interpreter} setup.py kitty.app --update-check-interval=0
|
||||
'' else ''
|
||||
|
|
@ -123,6 +125,6 @@ buildPythonApplication rec {
|
|||
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.darwin ++ platforms.linux;
|
||||
maintainers = with maintainers; [ tex rvolosatovs ma27 ];
|
||||
maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -217,7 +217,7 @@ def init_env(
|
||||
cflags = os.environ.get(
|
||||
'OVERRIDE_CFLAGS', (
|
||||
'-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
|
||||
- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
|
||||
+ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
|
||||
).format(
|
||||
float_conversion,
|
||||
optimize,
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook
|
||||
, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell
|
||||
, howard-hinnant-date, cmake
|
||||
, traySupport ? true, libdbusmenu-gtk3
|
||||
, pulseSupport ? false, libpulseaudio
|
||||
, nlSupport ? true, libnl
|
||||
|
|
@ -9,21 +10,21 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waybar";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexays";
|
||||
repo = "Waybar";
|
||||
rev = version;
|
||||
sha256 = "1w8a6jih872ry288k8ic6mjfi9ccf1jwc24wnh9p5c7w73247c2c";
|
||||
sha256 = "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig scdoc wrapGAppsHook
|
||||
meson ninja pkgconfig scdoc wrapGAppsHook cmake
|
||||
];
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
[ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell ]
|
||||
[ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ]
|
||||
++ optional traySupport libdbusmenu-gtk3
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optional nlSupport libnl
|
||||
|
|
@ -50,5 +51,6 @@
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ];
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://github.com/alexays/waybar";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index df5fef3..80f071a 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -2158,12 +2158,12 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
+ "sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sass-sys"
|
||||
-version = "0.4.13"
|
||||
+version = "0.4.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -3410,7 +3410,7 @@ dependencies = [
|
||||
"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
|
||||
"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
|
||||
"checksum sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd"
|
||||
-"checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972"
|
||||
+"checksum sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "304b6f9501d1da13f17404aeee85486d7383d06074906669b3ea032f81e83d22"
|
||||
"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
|
||||
"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
|
||||
"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
|
||||
|
|
@ -1,23 +1,19 @@
|
|||
{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices }:
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, CoreServices }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zola";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getzola";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "13kbgxh7r6124d1fjdf0x599j1kpgixp1y9d299zb5vrd6rf5wy5";
|
||||
sha256 = "112aqv21gy1fbly5v2x3ph32pr82d1mwh0q57yfaaqygz2madypb";
|
||||
};
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
# Delete this on next update; see #79975 for details
|
||||
legacyCargoFetcher = true;
|
||||
cargoSha256 = "0hqa60bx8pxhgad7x6r4zbwddrkcspnnp53bl94zbf3j47p10ggz";
|
||||
|
||||
cargoSha256 = "03rwf5l1l3ap03qi0xqcxsbyvpg3cqmr50j8ql6c5v55xl0ki9w8";
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin CoreServices;
|
||||
|
||||
|
|
@ -32,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A fast static site generator with everything built-in";
|
||||
homepage = https://www.getzola.org/;
|
||||
homepage = "https://www.getzola.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dywedir ];
|
||||
platforms = platforms.all;
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@ let
|
|||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby";
|
||||
sha256 = "06bcnsfb4kz92bh8xjxwaghhy9x2mmcb76wk3fv868jb1ga75vd8";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "1.4.2";
|
||||
commit = "48cced9d925b5bc94f6aa9fa4a8a19b2a59e128a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
|
|
@ -16,6 +17,14 @@ buildGoModule rec {
|
|||
nativeBuildInputs = [ packr ];
|
||||
|
||||
patches = [ ./use-go-module.patch ];
|
||||
|
||||
buildFlagsArray = ''
|
||||
-ldflags=
|
||||
-X github.com/argoproj/argo-cd/common.version=${version}
|
||||
-X github.com/argoproj/argo-cd/common.buildDate=unknown
|
||||
-X github.com/argoproj/argo-cd/common.gitCommit=${commit}
|
||||
-X github.com/argoproj/argo-cd/common.gitTreeState=clean
|
||||
'';
|
||||
|
||||
# run packr to embed assets
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "FlexGet";
|
||||
version = "3.1.21";
|
||||
version = "3.1.26";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ea2c9225bbf565215fc97eed97e718f426b4b7b3c8628bbd8edcc96e7bfe7e4e";
|
||||
sha256 = "0bd8ccc9ae8e9fd9d5aa4f61a1a5d8b62ff30257fc0f5b2ec61b2f4b26275eee";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "riot-web";
|
||||
version = "1.5.9";
|
||||
version = "1.5.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
|
||||
sha256 = "1qibbgjzhiwn1lnfm3pbfn6jahphgyf6625mp4v0ah2is75x16ys";
|
||||
sha256 = "1c11x8903p38c0f9k3ff4pnpb3n7hzs4pj6g65a4cvp6jgg1zfnn";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "A glossy Matrix collaboration client for the web";
|
||||
homepage = http://riot.im/;
|
||||
maintainers = with stdenv.lib.maintainers; [ bachp pacien ];
|
||||
maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ];
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
hydraPlatforms = [];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@ let
|
|||
pname = overrides.type;
|
||||
version = source.version;
|
||||
|
||||
patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
|
||||
patches = (source.patches or [])
|
||||
++ optional jackSupport ./mumble-jack-support.patch
|
||||
++ [ ./fix-rnnoise-argument.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python qt5.qmake ]
|
||||
++ (overrides.nativeBuildInputs or [ ]);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
nixpkgs has a more recent rnnoise than the one used by mumble, and rnnoise
|
||||
changed the argument rnnoise_create[1],
|
||||
|
||||
[1] https://github.com/xiph/rnnoise/commit/231b9c02d14a74cb449a98004cb7a2cf1bdeca2f
|
||||
|
||||
--- old/src/mumble/AudioInput.cpp 2020-02-18 22:55:32.000000000 -0500
|
||||
+++ new/src/mumble/AudioInput.cpp 2020-02-18 22:58:08.000000000 -0500
|
||||
@@ -106,7 +106,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef USE_RNNOISE
|
||||
- denoiseState = rnnoise_create();
|
||||
+ denoiseState = rnnoise_create(NULL);
|
||||
#endif
|
||||
|
||||
qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize);
|
||||
|
|
@ -7,7 +7,7 @@ with stdenv; with lib;
|
|||
mkDerivation rec {
|
||||
name = "cvs-fast-export-${meta.version}";
|
||||
meta = {
|
||||
version = "1.50";
|
||||
version = "1.51";
|
||||
description = "Export an RCS or CVS history as a fast-import stream";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dfoxfranke ];
|
||||
|
|
@ -16,8 +16,8 @@ mkDerivation rec {
|
|||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.50.tar.gz";
|
||||
sha256 = "01m5l9xnl387hpyik5jvyhghkffj5v1wyxqpxpjxv69q9ly905yk";
|
||||
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.51.tar.gz";
|
||||
sha256 = "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -234,6 +234,7 @@ stdenv.mkDerivation {
|
|||
for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
|
||||
sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
|
||||
-e "s|exec wish|exec '${tk}/bin/wish'|g" \
|
||||
-e "s|exec \"[^\"]*/MacOS/Wish\"|exec '${tk}/bin/wish'|g" \
|
||||
"$out/$prog"
|
||||
done
|
||||
ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "meld";
|
||||
version = "3.20.1";
|
||||
version = "3.20.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55";
|
||||
sha256 = "0a0x156zr3w2yg0rnhwy39giy3xnfm6sqcfa4xcw4i6ahvwqa2dc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, git, gnupg }:
|
||||
|
||||
let version = "2.3.0"; in
|
||||
let version = "2.4.0"; in
|
||||
stdenv.mkDerivation {
|
||||
pname = "yadm";
|
||||
inherit version;
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
|||
owner = "TheLocehiliosan";
|
||||
repo = "yadm";
|
||||
rev = version;
|
||||
sha256 = "1by21dh48qbi33wlyyvdwz7ac1lxrblzcr5v7hlnc4cbcgvgs1a0";
|
||||
sha256 = "0kpahznrkxkyj92vrhwjvldg2affi1askgwvpgbs4mg40f92szlp";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
|
||||
, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
|
||||
, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs
|
||||
, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
|
||||
, nv-codec-headers, lua, libuchardet, libiconv ? null
|
||||
, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
|
||||
|
||||
, waylandSupport ? stdenv.isLinux
|
||||
, wayland ? null
|
||||
|
|
@ -38,11 +39,12 @@
|
|||
, libpngSupport ? true, libpng ? null
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
|
||||
, rubberbandSupport ? stdenv.isLinux, rubberband ? null
|
||||
, screenSaverSupport ? true, libXScrnSaver ? null
|
||||
, sambaSupport ? stdenv.isLinux, samba ? null
|
||||
, screenSaverSupport ? true, libXScrnSaver ? null
|
||||
, sdl2Support ? true, SDL2 ? null
|
||||
, sndioSupport ? true, sndio ? null
|
||||
, speexSupport ? true, speex ? null
|
||||
, swiftSupport ? false, swift ? null
|
||||
, theoraSupport ? true, libtheora ? null
|
||||
, vaapiSupport ? stdenv.isLinux, libva ? null
|
||||
, vdpauSupport ? true, libvdpau ? null
|
||||
|
|
@ -119,7 +121,6 @@ in stdenv.mkDerivation rec {
|
|||
"--disable-libmpv-static"
|
||||
"--disable-static-build"
|
||||
"--disable-build-date" # Purity
|
||||
"--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported
|
||||
(enableFeature archiveSupport "libarchive")
|
||||
(enableFeature cddaSupport "cdda")
|
||||
(enableFeature dvdnavSupport "dvdnav")
|
||||
|
|
@ -130,11 +131,13 @@ in stdenv.mkDerivation rec {
|
|||
(enableFeature vaapiSupport "vaapi")
|
||||
(enableFeature waylandSupport "wayland")
|
||||
(enableFeature stdenv.isLinux "dvbin")
|
||||
];
|
||||
] # Disable whilst Swift isn't supported
|
||||
++ stdenv.lib.optional (!swiftSupport) "--disable-macos-cocoa-cb";
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 wafHook which
|
||||
];
|
||||
]
|
||||
++ optional swiftSupport swift;
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg_4 freetype libass libpthreadstubs
|
||||
|
|
@ -171,9 +174,7 @@ in stdenv.mkDerivation rec {
|
|||
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
|
||||
++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
|
||||
++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ]
|
||||
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
CoreFoundation Cocoa CoreAudio
|
||||
]);
|
||||
++ optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
i3.overrideAttrs (oldAttrs : rec {
|
||||
|
||||
name = "i3-gaps-${version}";
|
||||
version = "4.17.1";
|
||||
version = "4.18";
|
||||
releaseDate = "2019-01-27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
|
||||
sha256 = "02jpvwmfwv58dfdwvcvkdfcyca7l7zw7hx18aj4cqm3gg0r5pmqh";
|
||||
sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
|
||||
{ stdenv, fetchurl, perl, kbd, bdftopcf
|
||||
, libfaketime, fonttosfnt, mkfontscale
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "uni-vga";
|
||||
|
|
@ -8,24 +12,50 @@ stdenv.mkDerivation {
|
|||
sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ mkfontdir mkfontscale ];
|
||||
nativeBuildInputs =
|
||||
[ bdftopcf libfaketime
|
||||
fonttosfnt mkfontscale
|
||||
] ++ optionals stdenv.isLinux [ perl kbd ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts
|
||||
cp *.bdf $out/share/fonts
|
||||
cd $out/share/fonts
|
||||
mkfontdir
|
||||
mkfontscale
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
buildPhase = ''
|
||||
# convert font to compressed pcf
|
||||
bdftopcf u_vga16.bdf | gzip -c -9 -n > u_vga16.pcf.gz
|
||||
|
||||
# convert bdf font to otb
|
||||
faketime -f "1970-01-01 00:00:01" \
|
||||
fonttosfnt -v -o u_vga16.otb u_vga16.bdf
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
# convert font to compressed psf
|
||||
./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \
|
||||
| psfaddtable - UniCyrX.sfm - \
|
||||
| gzip -c -9 -n > u_vga16.psf.gz
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7";
|
||||
installPhase = ''
|
||||
# install pcf (for X11 applications)
|
||||
install -m 644 -D *.pcf.gz -t "$out/share/fonts"
|
||||
mkfontdir "$out/share/fonts"
|
||||
|
||||
# install bdf font
|
||||
install -m 644 -D *.bdf -t "$bdf/share/fonts"
|
||||
mkfontdir "$bdf/share/fonts"
|
||||
|
||||
# install otb font (for GTK applications)
|
||||
install -m 644 -D *.otb -t "$otb/share/fonts"
|
||||
mkfontdir "$otb/share/fonts"
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
# install psf (for linux virtual terminal)
|
||||
install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
|
||||
'';
|
||||
|
||||
outputs = [ "out" "bdf" "otb" ];
|
||||
|
||||
meta = {
|
||||
description = "Unicode VGA font";
|
||||
maintainers = [stdenv.lib.maintainers.ftrvxmtrx];
|
||||
maintainers = [ maintainers.ftrvxmtrx ];
|
||||
homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,11 +43,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1s4y29iszvd3zppgxx2qc2jr1lg7ipl3072jnn8g2l3bghcvq7xq";
|
||||
sha256 = "136vpaq94ymyn8pf3a3z1w45xlk1xbvwjdnzasq0d7iwbac0jwks";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "file-roller";
|
||||
version = "3.32.3";
|
||||
version = "3.32.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0ap2hxvjljh4p6wsd9ikh2my3vsxp9r2nvjxxj3v87nwfyw1y4dy";
|
||||
sha256 = "05s046br4fcli1d3wngh4jmwi0aikpfkl1px1cahskj4rfzjqfqv";
|
||||
};
|
||||
|
||||
LANG = "en_US.UTF-8"; # postinstall.py
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1izhqgsb658lzrzj12dw06w47bjhqdpfl0j74aq7bzql7nqsb3wa";
|
||||
sha256 = "1bqrl36nngbd8jpj31ipnywg2k0rg2j3bcgnyvn8r86ysh1gnm0f";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gnome-music";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0kp7r6l8hb8aq9j2fdiw49p7hyls4gllz258qy6fp3bbfzmbn4g7";
|
||||
sha256 = "1l2jaf5jfdkqqpjxwahsjslb3sa2vlhjgpi1ib51is04ln729xb6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
let
|
||||
pname = "dconf-editor";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "12q2cjds5fbarc5zajmhbx9vrbfn28hrklrk1fbgdv1ykxm1ljcv";
|
||||
sha256 = "129a2klywvnrj49rz6p5camwsamajldqpsfkl1rgpm6nw0q2lnyy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "3.34.3.1";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0vga9bqcv792ivnlw6pbfz17zn0nh6wq01rp60c4px08l7xpkr00";
|
||||
sha256 = "13ar3s40cds1rplwbzx0fzigf120w0rydiv05r3k6zpc0zy91qb0";
|
||||
};
|
||||
|
||||
# Tests need an X display
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1af3f218i5h3df81xkjdij0n9knsw355fsmhzdrfh1bflxfarpyj";
|
||||
sha256 = "1wz8mizblmvficxap6z9w62ymjwa8x99spnaljcwjl1wc55lnp4q";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -62,16 +62,17 @@
|
|||
, vino
|
||||
, gnome-user-share
|
||||
, gnome-remote-desktop
|
||||
, shadow
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "3.34.2";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "054igagvmyzpaa5nwzz98gv7bk7l5dwp6g813707132si3szlpx8";
|
||||
sha256 = "0bi7lsmr5hcf0v17brsa8j33p6i0wnh620bzwycmxryfp6s6vshp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -138,6 +139,7 @@ stdenv.mkDerivation rec {
|
|||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
gcm = gnome-color-manager;
|
||||
usermod = "${shadow}/bin/usermod";
|
||||
gnome_desktop = gnome-desktop;
|
||||
inherit glibc libgnomekbd tzdata;
|
||||
inherit cups networkmanagerapplet;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ index 96b25140c..1ad704d4a 100644
|
|||
typedef struct _TzDB TzDB;
|
||||
typedef struct _TzLocation TzLocation;
|
||||
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
|
||||
index 4541986db..da7826bfe 100644
|
||||
index 7fce8691e..b839f8b69 100644
|
||||
--- a/panels/info/cc-info-overview-panel.c
|
||||
+++ b/panels/info/cc-info-overview-panel.c
|
||||
@@ -187,7 +187,7 @@ load_gnome_version (char **version,
|
||||
|
|
@ -84,10 +84,10 @@ index 9390a3308..d30b4a68e 100644
|
|||
}
|
||||
|
||||
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
|
||||
index 360fbfc72..870157a11 100644
|
||||
index dd99a7485..4baa88a4e 100644
|
||||
--- a/panels/network/net-device-wifi.c
|
||||
+++ b/panels/network/net-device-wifi.c
|
||||
@@ -1385,7 +1385,7 @@ device_wifi_edit (NetObject *object)
|
||||
@@ -1445,7 +1445,7 @@ device_wifi_edit (NetObject *object)
|
||||
return;
|
||||
}
|
||||
uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
|
||||
|
|
@ -123,10 +123,10 @@ index f53ba217e..d24bcaeb9 100644
|
|||
|
||||
/* Use SNMP to get printer's informations */
|
||||
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
|
||||
index 35859526d..21486c917 100644
|
||||
index e0604b8c3..fc323c1b2 100644
|
||||
--- a/panels/region/cc-region-panel.c
|
||||
+++ b/panels/region/cc-region-panel.c
|
||||
@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self,
|
||||
@@ -763,10 +763,10 @@ row_layout_cb (CcRegionPanel *self,
|
||||
layout_variant = cc_input_source_get_layout_variant (source);
|
||||
|
||||
if (layout_variant && layout_variant[0])
|
||||
|
|
@ -140,7 +140,7 @@ index 35859526d..21486c917 100644
|
|||
|
||||
g_spawn_command_line_async (commandline, NULL);
|
||||
diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
|
||||
index 00239ce0f..617c98870 100644
|
||||
index 19934f186..9f41a9620 100644
|
||||
--- a/panels/user-accounts/run-passwd.c
|
||||
+++ b/panels/user-accounts/run-passwd.c
|
||||
@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
|
||||
|
|
@ -152,6 +152,19 @@ index 00239ce0f..617c98870 100644
|
|||
argv[1] = NULL;
|
||||
|
||||
envp = g_get_environ ();
|
||||
diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c
|
||||
index 83d4cd091..e8784c722 100644
|
||||
--- a/panels/user-accounts/user-utils.c
|
||||
+++ b/panels/user-accounts/user-utils.c
|
||||
@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username,
|
||||
* future, so it would be nice to have some official way for this
|
||||
* instead of relying on the current "--login" implementation.
|
||||
*/
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@usermod@";
|
||||
argv[1] = "--login";
|
||||
argv[2] = data->username;
|
||||
argv[3] = "--";
|
||||
diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
|
||||
index 9cb92007a..84d2f0fa3 100644
|
||||
--- a/tests/datetime/test-endianess.c
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-disk-utility";
|
||||
version = "3.34.0";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1mb7q90lnlp97dhxhnadhjagcfd12dfqzp0vj9h6b1r61pzhy97y";
|
||||
sha256 = "0p7pifmihg1vpsvym4qabdjqdp96yx9b4cbc6cnmf5i055js7i8y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "12mxavjf83d96qd5m8k0z2jnpi1587i25al5w9xpv965hvrvwx14";
|
||||
sha256 = "0rm32h7lv4vyadi9x32sb6fwxslarwk70yzmvzjxbq872cazp779";
|
||||
};
|
||||
|
||||
LANG = "en_US.UTF-8";
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutter";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "12aaxmclg3aw7qkk3pzpw8f5vrk0cxwprdrjnx9bjpf31gfpvxfd";
|
||||
sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simple-scan";
|
||||
version = "3.34.2";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp";
|
||||
sha256 = "0xvy672zyl6jsdlnxma8nc2aqsx9k92jhp6wfxs0msj9ppp1nd3z";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "four-in-a-row";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1agdjg9kcfcfaq3d2w4s4ksci6is1jzfnxanp3f84zqdq55s0k1y";
|
||||
sha256 = "1gw54llbmbv4w2rxmmkzq2wq6sacnpj99maw06zpn071cga0g4z5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
let
|
||||
pname = "gnome-klotski";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0swbyjlgrkd1hgcmp23h7p8fpjm2rpmnn87n6is0jx1x4cl8ab18";
|
||||
sha256 = "1bg7hl64lmjryzvp51qfak5jqs7vbqfmj0s7h1g3c7snscca7rx6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-taquin";
|
||||
version = "3.34.3";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0njlcqb316qbi0dm2j39s42ca8gc2fqmk5aqill5gpb57znb4d81";
|
||||
sha256 = "0s8gsgaj1mxldg5yaq6k9anfha9bc4n16wms66kbbpqi8k5hcm40";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-tetravex";
|
||||
version = "3.34.1";
|
||||
version = "3.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "05i9y6x9ai7fay0khr4zb4ji92qs49v88p3lqx9lac8hz04dnvg0";
|
||||
sha256 = "1sm90nkpig02hwk7bh5bnf65awgssxl63bvvh2a7gmlaln8x99iy";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iagno";
|
||||
version = "3.34.4";
|
||||
version = "3.34.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0v0x2dmgcgfcjmbx21arnrwdx9xwa5q05wrm8a9sgrjjzqx6ynwb";
|
||||
sha256 = "05qywjcar29vk29yvbxwlddxhwlrvllgjw7srmlz5811hc5m0a1m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geary";
|
||||
version = "3.34.1";
|
||||
version = "3.34.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1bx57g8199pcqh1p90dlnca2g1kpyrifr6g8m1rdjmpm2a1r993v";
|
||||
sha256 = "1a6j70pzr57ga7m4nypqdkqwlzk2dablpz93yaympgrlqpf5zkvm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -178,15 +178,6 @@ let
|
|||
}));
|
||||
|
||||
in rec {
|
||||
binaryCrystal_0_26 = genericBinary {
|
||||
version = "0.26.1";
|
||||
sha256s = {
|
||||
x86_64-linux = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
|
||||
i686-linux = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
|
||||
x86_64-darwin = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s";
|
||||
};
|
||||
};
|
||||
|
||||
binaryCrystal_0_27 = genericBinary {
|
||||
version = "0.27.2";
|
||||
sha256s = {
|
||||
|
|
@ -223,20 +214,6 @@ in rec {
|
|||
};
|
||||
};
|
||||
|
||||
crystal_0_25 = generic {
|
||||
version = "0.25.1";
|
||||
sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl";
|
||||
doCheck = false;
|
||||
binary = binaryCrystal_0_26;
|
||||
};
|
||||
|
||||
crystal_0_26 = generic {
|
||||
version = "0.26.1";
|
||||
sha256 = "0jwxrqm99zcjj82gyl6bzvnfj79nwzqf8sa1q3f66q9p50v44f84";
|
||||
doCheck = false; # about 20 tests out of more than 14000 are failing
|
||||
binary = binaryCrystal_0_26;
|
||||
};
|
||||
|
||||
crystal_0_27 = generic {
|
||||
version = "0.27.2";
|
||||
sha256 = "0vxqnpqi85yh0167nrkbksxsni476iwbh6y3znbvbjbbfhsi3nsj";
|
||||
|
|
|
|||
|
|
@ -5,33 +5,40 @@ let
|
|||
let
|
||||
graalvmXXX-ee = stdenv.mkDerivation rec {
|
||||
pname = "graalvm${javaVersion}-ee";
|
||||
version = "19.3.1";
|
||||
version = "20.0.0";
|
||||
srcs = [
|
||||
(requireFile {
|
||||
name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz";
|
||||
sha256 = { "8" = "b4833f1996e0e271d8abde1d0af3420e2bc6797624515a3720bdbedfa99b1e82";
|
||||
"11" = "a965abb093934712f31cd2183f3f0d68ed1410a50365489f665a30e5382908dc";
|
||||
sha256 = { "8" = "2df9b31b96f7a24b6a2fe3ecea0b5e819d5d058fde6320016dba1787ce59e99e";
|
||||
"11" = "b704fd27b5993584a1ad659b41f42ff0ae8893c066b64a6f6a1719fbee382536";
|
||||
}.${javaVersion};
|
||||
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
|
||||
})
|
||||
(requireFile {
|
||||
name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
|
||||
sha256 = { "8" = "fe3447dd60fbe3da39c650654594796873cd6bc9995d1430a421363e71d41702";
|
||||
"11" = "53357b7facb36c7b38857a2369471d0e869c0ff45555aa8baf2ab84de0c4782c";
|
||||
}.${javaVersion};
|
||||
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
|
||||
})
|
||||
(requireFile {
|
||||
name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
|
||||
sha256 = { "8" = "003e9574e18656a82626aa5d310fac31979abc04955587d68ff977808829a91d";
|
||||
"11" = "65558e14a25802001f3c79571a09170fa11564de34df6987724163416d3889bf";
|
||||
sha256 = { "8" = "a9f3f86d880d133bd24ad3b1d95129a96e80ea1d8fbc865d09e9410b921e6897";
|
||||
"11" = "57086123a95f1e9d4e67b92f830bad9325431908c69a40ef10f28ed586d8bd35";
|
||||
}.${javaVersion};
|
||||
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
|
||||
})
|
||||
(requireFile {
|
||||
name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
|
||||
sha256 = { "8" = "45abe74d10e09680f1e40101f93def5615e65f29ced328054a40c8517e054290";
|
||||
"11" = "3d4de372b78b68dbd966b36489d1c6d84a326990e91a0314fb77404eed0741ad";
|
||||
sha256 = { "8" = "28b2910736f41070c84b97f1b1a3c5fa43ebdcd926ec92c8f145550b5b975b3c";
|
||||
"11" = "27ff1befa67fe5cc9eb0216b6b1105876f44d13eff6137f36f29f13377ea687b";
|
||||
}.${javaVersion};
|
||||
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
|
||||
})
|
||||
(requireFile {
|
||||
name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
|
||||
sha256 = { "8" = "9c83bcd71e316805c2914c9002ce348ae44829606adc2375d9188b1eaaaf82f9";
|
||||
"11" = "5ca51478bcb5ea5bd9be35856dd7fb2ef03b888cd1b7284a8c15531979025fb4";
|
||||
}.${javaVersion};
|
||||
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
|
||||
})
|
||||
(requireFile {
|
||||
name = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
|
||||
sha256 = { "8" = "e8bd14d3f9bf652104e4346e0899a0351afaecae030a9c0ce0f91b1f93d9e660";
|
||||
"11" = "d24eeb84625bb7a5e330b897fd6dde7fc579a687997b64625199c33fa83c40b4";
|
||||
}.${javaVersion};
|
||||
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
|
||||
})
|
||||
|
|
@ -62,6 +69,7 @@ let
|
|||
unpack_jar ''${arr[1]}
|
||||
unpack_jar ''${arr[2]}
|
||||
unpack_jar ''${arr[3]}
|
||||
unpack_jar ''${arr[4]}
|
||||
'';
|
||||
|
||||
installPhase = {
|
||||
|
|
|
|||
|
|
@ -263,23 +263,23 @@ let
|
|||
|
||||
in {
|
||||
php72 = generic {
|
||||
version = "7.2.26";
|
||||
sha256 = "0yw49v3rk3cd0fb4gsli74pgd4qrykhn9c37dyfr3zsprzp8cvgk";
|
||||
version = "7.2.27";
|
||||
sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v";
|
||||
|
||||
# https://bugs.php.net/bug.php?id=76826
|
||||
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
|
||||
};
|
||||
|
||||
php73 = generic {
|
||||
version = "7.3.13";
|
||||
sha256 = "1g376b9caw21mw8738z354llbzb3shzgc60m7naw7wql5038jysw";
|
||||
version = "7.3.14";
|
||||
sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr";
|
||||
|
||||
# https://bugs.php.net/bug.php?id=76826
|
||||
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
|
||||
};
|
||||
|
||||
php74 = generic {
|
||||
version = "7.4.1";
|
||||
sha256 = "0klfwhm2935ariwzqdri1fwh4a0vbrk3jis53qzi18isp3qa073b";
|
||||
version = "7.4.2";
|
||||
sha256 = "05p8z0ld058yjanxaphy3ka20hn7x7d6nak5sm782w4wprs9k402";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "howard-hinnant-date-unstable";
|
||||
version = "2020-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HowardHinnant";
|
||||
repo = "date";
|
||||
rev = "9a0ee2542848ab8625984fc8cdbfb9b5414c0082";
|
||||
sha256 = "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch";
|
||||
sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ curl ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TZ_LIB=true"
|
||||
"-DBUILD_SHARED_LIBS=true"
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
license = licenses.mit;
|
||||
description = "A date and time library based on the C++11/14/17 <chrono> header";
|
||||
homepage = "https://github.com/HowardHinnant/date";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ncurses, readline, autoreconfHook }:
|
||||
{ stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.7.0";
|
||||
|
|
@ -14,7 +14,14 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ ncurses readline ];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ];
|
||||
patches = [
|
||||
./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch
|
||||
(fetchpatch {
|
||||
name = "CVE-2019-16707.patch";
|
||||
url = "https://github.com/hunspell/hunspell/commit/ac938e2ecb48ab4dd21298126c7921689d60571b.patch";
|
||||
sha256 = "0bwfksz87iy7ikx3fb54zd5ww169qfm9kl076hsch3cs8p30s8az";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs tests
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libiio";
|
||||
version = "0.18";
|
||||
version = "0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "analogdevicesinc";
|
||||
repo = "libiio";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1cmg3ipam101iy9yncwz2y48idaqaw4fg7i9i4c8vfjisfcycnkk";
|
||||
sha256 = "1r67h5mayx9krh3mmzs5vz20mvwb2lw04hpbyyisygl01ndc77kq";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "python" ];
|
||||
|
|
|
|||
|
|
@ -7,39 +7,42 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mimalloc";
|
||||
version = "1.1.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zql498587wvb0gaavnzxj2zm535sgm22x0sjgl4ncfk7ragnv9c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
enableParallelBuilding = true;
|
||||
cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = let
|
||||
rel = stdenv.lib.versions.majorMinor version;
|
||||
in ''
|
||||
# first, install headers, that's easy
|
||||
mkdir -p $dev
|
||||
mv $out/lib/*/include $dev/include
|
||||
|
||||
# move .a and .o files into place
|
||||
mv $out/lib/mimalloc-1.0/libmimalloc*.a $out/lib/libmimalloc.a
|
||||
mv $out/lib/mimalloc-1.0/mimalloc*.o $out/lib/mimalloc.o
|
||||
find $out/lib
|
||||
mv $out/lib/mimalloc-${rel}/libmimalloc*.a $out/lib/libmimalloc.a
|
||||
mv $out/lib/mimalloc-${rel}/mimalloc*.o $out/lib/mimalloc.o
|
||||
|
||||
'' + (if secureBuild then ''
|
||||
mv $out/lib/mimalloc-1.0/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext}.1.0
|
||||
ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext}
|
||||
ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc${soext}
|
||||
mv $out/lib/mimalloc-${rel}/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}.${rel}
|
||||
ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}
|
||||
ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc${soext}
|
||||
'' else ''
|
||||
mv $out/lib/mimalloc-1.0/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext}.1.0
|
||||
ln -sfv $out/lib/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext}
|
||||
mv $out/lib/mimalloc-${rel}/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}.${rel}
|
||||
ln -sfv $out/lib/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}
|
||||
'') + ''
|
||||
# remote duplicate dir. FIXME: try to fix the .cmake file distribution
|
||||
# so we can re-use it for dependencies...
|
||||
rm -rf $out/lib/mimalloc-1.0
|
||||
rm -rf $out/lib/mimalloc-${rel}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
@ -50,5 +53,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
badPlatforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.9.1";
|
||||
version = "4.9.2";
|
||||
pname = "nco";
|
||||
|
||||
nativeBuildInputs = [ flex which ];
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nco/nco/archive/${version}.tar.gz";
|
||||
sha256 = "14r44wi9ina8h8gh5cmkcddxl5ziwv42mv60sp4l5wfmjz5xwa4x";
|
||||
sha256 = "0nip9dmdx3d5nc30bz1d2w9his1dph136l53r160aa3bmb29xwqn";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@ let openblas32 = openblas.override { blas64 = false; };
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "sundials";
|
||||
version = "5.0.0";
|
||||
version = "5.1.0";
|
||||
|
||||
buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran openblas32 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "1lvx5pddjxgyr8kqlira36kxckz7nxwc8xilzfyx0hf607n42l9l";
|
||||
sha256 = "08cvzmbr2qc09ayq4f5j07lw97hl06q4dl26vh4kh822mm7x28pv";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -26,11 +26,6 @@ in stdenv.mkDerivation rec {
|
|||
url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
|
||||
sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
|
||||
})
|
||||
(fetchurl {
|
||||
# https://github.com/LLNL/sundials/pull/20
|
||||
url = "https://github.com/LLNL/sundials/pull/20/commits/2d951bbe1ff7842fcd0dafa28c61b0aa94015f66.patch";
|
||||
sha256 = "0lcr6m4lk14yqrxah4rdscpczny5l7m1zpfsjh8bgspadfsgk512";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
|
|
@ -12,9 +13,12 @@ buildPythonPackage rec {
|
|||
sha256 = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tests/test.py --replace "DocumentationTestCase" "NoDocumentation"
|
||||
'';
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch;
|
||||
sha256 = "1q5nmff30vccqq5swf2ivm8cn7x3lhz8c9qpj0zddgs2y7fw8syz";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://pypi.python.org/pypi/decorator;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, futures
|
||||
, docloud
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docplex";
|
||||
version = "2.12.182";
|
||||
|
||||
# No source available from official repo
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "aaf150b06d44f07639aca48be1fca69c7732d57507e6adc4e8451c7a93489116";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
docloud
|
||||
requests
|
||||
] ++ lib.optional isPy27 futures;
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "docplex" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "IBM Decision Optimization CPLEX Modeling for Python";
|
||||
homepage = "https://onboarding-oaas.docloud.ibmcloud.com/software/analytics/docloud/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,17 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, python, zlib, clang
|
||||
, ncurses, pytest, docutils, pygments, numpy, scipy, scikitlearn }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, cmake
|
||||
, python
|
||||
, zlib
|
||||
, ncurses
|
||||
, pytest
|
||||
, docutils
|
||||
, pygments
|
||||
, numpy
|
||||
, scipy
|
||||
, scikitlearn }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vowpalwabbit";
|
||||
|
|
@ -10,21 +22,27 @@ buildPythonPackage rec {
|
|||
sha256 = "bd4c7e49a6ddaa1afedf97b22b822c7322328d686d45151b47a5127fc409c2af";
|
||||
};
|
||||
|
||||
# Should be fixed in next Python release after 8.5.0:
|
||||
# https://github.com/JohnLangford/vowpal_wabbit/pull/1533
|
||||
patches = [
|
||||
./vowpal-wabbit-find-boost.diff
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
# vw tries to write some explicit things to home
|
||||
# python installed: The directory '/homeless-shelter/.cache/pip/http'
|
||||
preInstall = ''
|
||||
export HOME=$PWD
|
||||
'';
|
||||
buildInputs = [
|
||||
docutils
|
||||
ncurses
|
||||
pygments
|
||||
python.pkgs.boost
|
||||
zlib.dev
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ clang ];
|
||||
buildInputs = [ python.pkgs.boost zlib.dev ncurses pytest docutils pygments ];
|
||||
propagatedBuildInputs = [ numpy scipy scikitlearn ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scikitlearn
|
||||
scipy
|
||||
];
|
||||
|
||||
# Python build script uses CMake, but we don't want CMake to do the
|
||||
# configuration.
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
# Python ctypes.find_library uses DYLD_LIBRARY_PATH.
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
@ -34,12 +52,12 @@ buildPythonPackage rec {
|
|||
checkPhase = ''
|
||||
# check-manifest requires a git clone, not a tarball
|
||||
# check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
|
||||
${python.interpreter} setup.py check -mrs
|
||||
${python.interpreter} setup.py check -ms
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
|
||||
homepage = https://github.com/JohnLangford/vowpal_wabbit;
|
||||
homepage = "https://github.com/JohnLangford/vowpal_wabbit";
|
||||
license = licenses.bsd3;
|
||||
broken = stdenv.isAarch64;
|
||||
maintainers = with maintainers; [ teh ];
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
--- vowpalwabbit-8.5.0.orig/setup.py 2018-09-03 20:32:39.000000000 +0200
|
||||
+++ vowpalwabbit-8.5.0/setup.py 2018-09-03 20:34:09.000000000 +0200
|
||||
@@ -23,18 +23,11 @@
|
||||
|
||||
def find_boost():
|
||||
"""Find correct boost-python library information """
|
||||
- if system == 'Linux':
|
||||
+ if system == 'Linux' or system == 'Darwin':
|
||||
# use version suffix if present
|
||||
- boost_lib = 'boost_python-py{v[0]}{v[1]}'.format(v=sys.version_info)
|
||||
- if sys.version_info.major == 3:
|
||||
- for candidate in ['-py36', '-py35', '-py34', '3']:
|
||||
- boost_lib = 'boost_python{}'.format(candidate)
|
||||
- if find_library(boost_lib):
|
||||
- exit
|
||||
+ boost_lib = 'boost_python{v[0]}{v[1]}'.format(v=sys.version_info)
|
||||
if not find_library(boost_lib):
|
||||
boost_lib = "boost_python"
|
||||
- elif system == 'Darwin':
|
||||
- boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
|
||||
elif system == 'Cygwin':
|
||||
boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
|
||||
else:
|
||||
--- vowpalwabbit-8.5.0.orig/src/Makefile 2018-09-03 20:32:40.000000000 +0200
|
||||
+++ vowpalwabbit-8.5.0/src/Makefile 2018-09-03 21:42:30.000000000 +0200
|
||||
@@ -37,7 +37,7 @@
|
||||
NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
|
||||
endif
|
||||
ifeq ($(UNAME), Darwin)
|
||||
- LIBS = -lboost_program_options-mt -lboost_serialization-mt -l pthread -l z
|
||||
+ LIBS = -lboost_program_options -lboost_serialization -l pthread -l z
|
||||
# On Macs, the location isn't always clear
|
||||
# brew uses /usr/local
|
||||
# but /opt/local seems to be preferred by some users
|
||||
|
|
@ -294,6 +294,12 @@ in
|
|||
libv8 = attrs: {
|
||||
buildInputs = [ which v8 python ];
|
||||
buildFlags = [ "--with-system-v8=true" ];
|
||||
dontBuild = false;
|
||||
postPatch = ''
|
||||
substituteInPlace ext/libv8/extconf.rb \
|
||||
--replace "location = Libv8::Location::Vendor.new" \
|
||||
"location = Libv8::Location::System.new"
|
||||
'';
|
||||
};
|
||||
|
||||
execjs = attrs: {
|
||||
|
|
|
|||
|
|
@ -1,42 +1,80 @@
|
|||
{ stdenv, fetchurl, pkgs, lib }:
|
||||
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, lib
|
||||
, autoPatchelfHook
|
||||
, wrapQtAppsHook
|
||||
, libbsd
|
||||
, python27
|
||||
, gmpxx
|
||||
, ncurses5
|
||||
, gnustep
|
||||
, libffi
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hopper";
|
||||
version = "4.5.7";
|
||||
pname = "hopper";
|
||||
version = "4.5.19";
|
||||
rev = "v${lib.versions.major version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
|
||||
sha256 = "1ce7a0f13126a940398aa8da4a74e250dff0401074f30446a8840ac3dbb902c0";
|
||||
sha256 = "1c9wbjwz5xn0skz2a1wpxyx78hhrm8vcbpzagsg4wwnyblap59db";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath [
|
||||
libbsd.out libffi.out gmpxx.out python27Full.out python27Packages.libxml2 qt5.qtbase zlib xlibs.libX11.out xorg_sys_opengl.out xlibs.libXrender.out gcc-unwrapped.lib
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
|
||||
|
||||
qtWrapperArgs = [ ''--suffix LD_LIBRARY_PATH : ${ldLibraryPath}'' ];
|
||||
buildInputs = [
|
||||
libbsd
|
||||
python27
|
||||
gmpxx
|
||||
ncurses5
|
||||
gnustep.libobjc
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib
|
||||
mkdir -p $out/share
|
||||
|
||||
cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper
|
||||
cp -r $sourceRoot/opt/hopper-${rev}/lib $out
|
||||
cp -r $sourceRoot/usr/share $out/share
|
||||
patchelf \
|
||||
--set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
|
||||
$out/bin/hopper
|
||||
cp \
|
||||
--archive \
|
||||
$sourceRoot/opt/hopper-${rev}/lib/libBlocksRuntime.so* \
|
||||
$sourceRoot/opt/hopper-${rev}/lib/libdispatch.so* \
|
||||
$sourceRoot/opt/hopper-${rev}/lib/libgnustep-base.so* \
|
||||
$sourceRoot/opt/hopper-${rev}/lib/libHopperCore.so* \
|
||||
$sourceRoot/opt/hopper-${rev}/lib/libkqueue.so* \
|
||||
$sourceRoot/opt/hopper-${rev}/lib/libobjcxx.so* \
|
||||
$sourceRoot/opt/hopper-${rev}/lib/libpthread_workqueue.so* \
|
||||
$out/lib
|
||||
|
||||
# we already ship libffi.so.7
|
||||
ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib/libffi.so.6
|
||||
|
||||
cp -r $sourceRoot/usr/share $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
postFixup = ''
|
||||
substituteInPlace "$out/share/applications/hopper-${rev}.desktop" \
|
||||
--replace "Exec=/opt/hopper-${rev}/bin/Hopper" "Exec=$out/bin/hopper"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://www.hopperapp.com/index.html";
|
||||
description = "A macOS and Linux Disassembler";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
maintainers = [ stdenv.lib.maintainers.luis ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [
|
||||
luis
|
||||
Enteee
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildBazelPackage rec {
|
||||
name = "bazel-remote-${version}";
|
||||
version = "2020-01-29";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buchgr";
|
||||
repo = "bazel-remote";
|
||||
rev = "ae9378321552dd14066332f8fa55076040228cb7";
|
||||
sha256 = "1jbd319n255cmmncnjfdkdcpx0x62asp3dqwgl6vimx4dqqj8v1p";
|
||||
rev = "v${version}";
|
||||
sha256 = "1fpdw139d5q1377qnqbgkahmdr4mdaa17d2m10wkyvyvijwm4r2m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go git ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bmake";
|
||||
version = "20181221";
|
||||
version = "20200212";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
|
||||
sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
|
||||
sha256 = "134ibplk5rj7s3ig2czbhqs89l45jl6vswg3cy6xzm0anz5smhb2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ getopt ];
|
||||
|
|
|
|||
|
|
@ -1,25 +1,29 @@
|
|||
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cloudflare-wrangler";
|
||||
version = "1.4.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "wrangler";
|
||||
rev = "v" + version;
|
||||
sha256 = "1agl1cg34iklvniygrkq8dqsampvg17d3nsm0dcr6c3n5rj09gbi";
|
||||
sha256 = "0vc7f3jki2fdwlgpwhaxzm58g2898wpwbib7dmibb9kxv4jna8gj";
|
||||
};
|
||||
|
||||
# Delete this on next update; see #79975 for details
|
||||
legacyCargoFetcher = true;
|
||||
|
||||
cargoSha256 = "0c2g6yghwqjy21yfdcri4v9aqizd06ww3zx2snns51gnqqk8r57k";
|
||||
cargoSha256 = "1f3gy3agpdg6pck5acxjfrd89hyp9x1byqhfizlizbfmwrqs4il8";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
curl
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
];
|
||||
|
||||
# tries to use "/homeless-shelter" and fails
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
name = "drone.io-${version}";
|
||||
version = "1.6.0";
|
||||
version = "1.6.5";
|
||||
goPackagePath = "github.com/drone/drone";
|
||||
|
||||
modSha256 = "0l33qib9riknrjdpsvd7n6slqp485vx66xl6w7m24b5sc7yfsg7m";
|
||||
modSha256 = "1fyb9218s52w8c6c3v6rgivbyzy5hz4q4z8r75ng2yrmjmmiv2gr";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drone";
|
||||
repo = "drone";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ij4a6rh17ib360bxrpncf8lp839b6sl17bd0fp3xvwmibk6xgjz";
|
||||
sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "golangci-lint";
|
||||
version = "1.22.2";
|
||||
version = "1.23.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wwp6ppm5p2cf7jbcgmqm6alzaj34sa079d98afw21yr81qxvvid";
|
||||
sha256 = "0y5kjlqbz9xxlxd8kagrsyz9wvjqf7i28i6zb2m8x9c9zg82kvsn";
|
||||
};
|
||||
|
||||
modSha256 = "02j2cf5778ds0vwz0kkd9c1x5ap732vkq20bfg440spfajscvndm";
|
||||
modSha256 = "0sckz298bvkf4p4fdmsmza0zrj2s2pvc86qwg6i76vdh9yzvq5gx";
|
||||
subPackages = [ "cmd/golangci-lint" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "heroku";
|
||||
version = "7.35.1";
|
||||
version = "7.38.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
|
||||
sha256 = "1b48jhl7a9nzvgankys32mfnv6i2kx11z874k7fz9px3kx8s7pbb";
|
||||
sha256 = "1sa4ph4d5y48yz2n06aivqgl07ljlgwgf5ik431vnrz5smxl6ngr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = https://cli.heroku.com;
|
||||
homepage = "https://cli.heroku.com";
|
||||
description = "Everything you need to get started using Heroku";
|
||||
maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ];
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoPackage rec {
|
||||
pname = "terraform-lsp";
|
||||
version = "0.0.9";
|
||||
version = "0.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juliosueiras";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1m133fznf58fkjl5yx0gxa3cjfb0h8f9fv760c9h1d5cg279bghk";
|
||||
sha256 = "1j69j1pkd0q6bds1c6pcaars5hl3hk93q2p31mymkzmy640k8zfn";
|
||||
};
|
||||
|
||||
modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2";
|
||||
goPackagePath = "github.com/juliosueiras/terraform-lsp";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitCommit=${src.rev}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Language Server Protocol for Terraform";
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ let
|
|||
else { pkg = []; str = null; };
|
||||
|
||||
# Fetch the artifacts from the PyPI index. Since we get all
|
||||
# info we need from the lock file we don't use nixpkgs' fetchPyPi
|
||||
# info we need from the lock file we don't use nixpkgs' fetchPypi
|
||||
# as it modifies casing while not providing anything we don't already
|
||||
# have.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "12.16.0";
|
||||
sha256 = "09grij355z210mkzkzarb6gwz8b02lnaxzdll1249kiz8wvhdjdq";
|
||||
version = "12.16.1";
|
||||
sha256 = "0ba1dla31z6i31z3723l74nky1v04irwbl3iaqmi0iicl1dq958a";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "13.8.0";
|
||||
sha256 = "1h437yvg43xci35rvp55gvb94rddkf4j9i9iw81bmkwhvb4h8qdv";
|
||||
version = "13.9.0";
|
||||
sha256 = "0z68hj3z2y8aj4bc14h77mj5l99jb4ljjc10gp0dpg8s4g1x5xzw";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ with frameworks; with libs; {
|
|||
LocalAuthentication = [];
|
||||
MapKit = [];
|
||||
MediaAccessibility = [ CoreGraphics CoreText QuartzCore ];
|
||||
MediaPlayer = [];
|
||||
MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ];
|
||||
Metal = [];
|
||||
MetalKit = [ ModelIO Metal ];
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ buildGoModule rec {
|
|||
pname = "gotify-server";
|
||||
# Note that when this is updated, along with the hash, the `ui.nix` file
|
||||
# should include the same changes to the version and the sha256.
|
||||
version = "2.0.13";
|
||||
version = "2.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotify";
|
||||
repo = "server";
|
||||
rev = "v${version}";
|
||||
sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d";
|
||||
sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8";
|
||||
};
|
||||
|
||||
modSha256 = "1awhbc8qs2bwv6y2vwd92r4ys0l1bzymrb36iamr040x961682wv";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec {
|
|||
packageJSON = ./package.json;
|
||||
yarnNix = ./yarndeps.nix;
|
||||
|
||||
version = "2.0.13";
|
||||
version = "2.0.14";
|
||||
|
||||
src_all = fetchFromGitHub {
|
||||
owner = "gotify";
|
||||
repo = "server";
|
||||
rev = "v${version}";
|
||||
sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d";
|
||||
sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8";
|
||||
};
|
||||
src = "${src_all}/ui";
|
||||
|
||||
|
|
|
|||
|
|
@ -1234,11 +1234,11 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "_types_notifyjs___notifyjs_3.0.0.tgz";
|
||||
name = "_types_notifyjs___notifyjs_3.0.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_notifyjs___notifyjs_3.0.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.0.tgz";
|
||||
sha1 = "a57126a90be2827d511d00a0615816cd5ca8a740";
|
||||
name = "_types_notifyjs___notifyjs_3.0.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.1.tgz";
|
||||
sha1 = "eba3bec10e44309df4aba31a73bfd26a562bc755";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mod_wsgi";
|
||||
version = "4.7.0";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
|
||||
sha256 = "079f4py20jd6n3d7djak5l9j8p6hfq96lf577iir6qpfsk2p0k3n";
|
||||
sha256 = "0dbxhrp3x689ccrhvm2lw2icmmj8i4p86z2lq3xn1zlsf43fax16";
|
||||
};
|
||||
|
||||
buildInputs = [ apacheHttpd python ncurses ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roundcube";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
|
||||
sha256 = "0s8gkfnyid1r4xv07vjrbl6558xv6dyn4aapvx8snqdm79n78fn8";
|
||||
sha256 = "1gsl9rpdkv388i6zvciladhb15fw94a8xjyh4ai1664nkwl51wi4";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cstore_fdw";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
nativeBuildInputs = [ protobufc ];
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "citusdata";
|
||||
repo = "cstore_fdw";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0kdmzpbhhjdg4p6i5963h7qbs88jzgpqc52gz450h7hwb9ckpv74";
|
||||
sha256 = "129mpq8rq16jg7idh6c1j6nij64iywrs7wl3cn02bdb3h8f19z1b";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_auto_failover";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citusdata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1idlgqazr2qra5x702f2yjcl99zwm1i5fi84paplfy98i5jjmxm1";
|
||||
sha256 = "0fli8wxi5f3vyn9cjjqi0a2z4i9npx4nqndx2lqzzx95khqqknp1";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql openssl zlib readline ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcm2ps";
|
||||
version = "8.14.6";
|
||||
version = "8.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leesavide";
|
||||
repo = "abcm2ps";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gqjqbd8wj0655vi8gcg2r5jqzafdlnfjzwa9z331ywhrskpm53w";
|
||||
sha256 = "0k12wf37vl31w2qpj3dsmv8c4ifrsg3qa30gqsx553jw7n0f3ma2";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, git, glibc }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.1";
|
||||
pname = "lepton";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "lepton";
|
||||
owner = "dropbox";
|
||||
rev = "c378cbfa2daaa99e8828be7395013f94cedb1bcc";
|
||||
rev = version;
|
||||
sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake git ];
|
||||
buildInputs = [ glibc.static ];
|
||||
buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/dropbox/lepton;
|
||||
description = "A tool to losslessly compress JPEGs";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ artemist ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clipman";
|
||||
version = "unstable-2019-12-10";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yory8";
|
||||
repo = pname;
|
||||
rev = "c57453be90bb4496f67275db8c0beb2116a6ce14";
|
||||
sha256 = "0zvqk3gcpx67dsn7qr0p9bgjp0sljl3yrlsfbqzrbrmj2lwr98ys";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b27rgyjwvdm9qjq824imda3yjbxxcwwyv8rzzk95ggvyayxw8an";
|
||||
};
|
||||
|
||||
modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gti";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rwos";
|
||||
repo = "gti";
|
||||
rev = "v${version}";
|
||||
sha256 = "19q3r4v22z2q1j4njap356f3mcq6kwh6v8nbbq2rw4x3cdxwdv51";
|
||||
sha256 = "1jivnjswlhwjfg5v9nwfg3vfssvqbdxxf9znwmfb5dgfblg9wxw9";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kepubify";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geek1011";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "168n4xbhjrzwzlhvakmsd0nwqjwgibphkwzq5hcxrk9ywpqpxjad";
|
||||
};
|
||||
|
||||
modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
subPackages = [ "." "covergen" "seriesmeta" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "EPUB to KEPUB converter";
|
||||
homepage = "https://pgaskin.net/kepubify";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zowoq ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "neo-cowsay";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Code-Hex";
|
||||
repo = "Neo-cowsay";
|
||||
rev = "v${version}";
|
||||
sha256 = "1in6kadczv05v62qhskqbdx7wppch0gwl0bshr5ihmi39k8l7v3z";
|
||||
sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1";
|
||||
};
|
||||
|
||||
modSha256 = "063ds35dzv8m4bjk7v1q3f6jwyp7j5jrkrhrl41z1c1mbzzkagkq";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "you-get";
|
||||
version = "0.4.1388";
|
||||
version = "0.4.1403";
|
||||
|
||||
# Tests aren't packaged, but they all hit the real network so
|
||||
# probably aren't suitable for a build environment anyway.
|
||||
|
|
@ -10,7 +10,7 @@ buildPythonApplication rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1afnyb5srs0prqm73pz5qbfk5j4lb5g70nqg41r4igh753p2yi13";
|
||||
sha256 = "195c91xxcv3l3rd0v8ls5ghncf92ndfx0lpcbjr5zb41bl8alkcl";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic";
|
||||
})
|
||||
];
|
||||
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
sed '1i#include <linux/sockios.h>' -i src/dhcp.c
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray=("COPTS=${copts}")
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-audit";
|
||||
version = "0.10.0";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustSec";
|
||||
repo = "cargo-audit";
|
||||
rev = "v${version}";
|
||||
sha256 = "1977ykablfi4mc6j2iil0bxc6diy07vi5hm56xmqj3n37ziavf1m";
|
||||
sha256 = "0py4z50ld4vs0g7vh8ga6v5h11nz2yfcpr3xqzpihf4p7sg1mdf4";
|
||||
};
|
||||
|
||||
cargoSha256 = "0bpqsg8mv94ivwmbfxfcnd89yx5vry33395ynqrzhqq9s1jwq0dq";
|
||||
cargoSha256 = "0n4q8767aby6fgq0z7wj966zgqydlwirrzgyahf234dz6arsxw2l";
|
||||
|
||||
buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwarden_rs-vault";
|
||||
version = "2.12.0b";
|
||||
version = "2.12.0c";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
|
||||
sha256 = "01jwyhcam9kh8lpxfgzzw7r3nn9sn6jbgmd78a7h8r50z5hy04g5";
|
||||
sha256 = "040bqbx6hpwq4qvv4s7d77gwp5n2ay9rr7kdb135582d80wjq5sp";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Integrates the web vault into bitwarden_rs";
|
||||
homepage = https://github.com/dani-garcia/bw_web_builds;
|
||||
homepage = "https://github.com/dani-garcia/bw_web_builds";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ msteen ];
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++
|
||||
stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
|
||||
|
||||
patches = [ ./disable-monotonic-timer-tests.patch ];
|
||||
|
||||
NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -39,7 +41,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
enableParallelChecking = false; # 4 tests fail randomly
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/src/test/test_util.c b/src/test/test_util.c
|
||||
index 0d86a5ab5..e93c6ba89 100644
|
||||
--- a/src/test/test_util.c
|
||||
+++ b/src/test/test_util.c
|
||||
@@ -5829,13 +5829,9 @@ test_util_monotonic_time(void *arg)
|
||||
/* We need to be a little careful here since we don't know the system load.
|
||||
*/
|
||||
tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_GE, 175);
|
||||
- tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_LT, 1000);
|
||||
tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_GE, 125);
|
||||
- tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_LT, 1000);
|
||||
tt_u64_op(nsec2-nsec1, OP_GE, 175000000);
|
||||
- tt_u64_op(nsec2-nsec1, OP_LT, 1000000000);
|
||||
tt_u64_op(nsecc2-nsecc1, OP_GE, 125000000);
|
||||
- tt_u64_op(nsecc2-nsecc1, OP_LT, 1000000000);
|
||||
|
||||
tt_u64_op(msec1, OP_GE, nsec1 / 1000000);
|
||||
tt_u64_op(usec1, OP_GE, nsec1 / 1000);
|
||||
@@ -5849,7 +5845,6 @@ test_util_monotonic_time(void *arg)
|
||||
uint64_t coarse_stamp_diff =
|
||||
monotime_coarse_stamp_units_to_approx_msec(stamp2-stamp1);
|
||||
tt_u64_op(coarse_stamp_diff, OP_GE, 120);
|
||||
- tt_u64_op(coarse_stamp_diff, OP_LE, 1200);
|
||||
|
||||
{
|
||||
uint64_t units = monotime_msec_to_approx_coarse_stamp_units(5000);
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "vale";
|
||||
version = "1.7.1";
|
||||
version = "2.0.0";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
@ -10,13 +10,15 @@ buildGoPackage rec {
|
|||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qi3brjppiymk6as0xic2n3bhq8g8qw1z8d9a24w60x9gp52yq5m";
|
||||
sha256 = "068973ayd883kzkxl60lpammf3icjz090nw07kfccvhcf24x07bh";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/errata-ai/vale";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://errata-ai.github.io/vale/;
|
||||
homepage = "https://errata-ai.gitbook.io/vale/";
|
||||
description = "A syntax-aware linter for prose built with speed and extensibility in mind";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
|
|
|
|||
|
|
@ -15,27 +15,35 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "gfngfn";
|
||||
repo = "camlpdf";
|
||||
rev = "v2.2.1+satysfi";
|
||||
sha256 = "1s8v2i8nq52kz038bvc2n0spz68fpdq6kgxrabcs6zvml6n1frzy";
|
||||
rev = "v2.2.2+satysfi";
|
||||
sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k";
|
||||
};
|
||||
});
|
||||
otfm = ocamlPackages.otfm.overrideAttrs (o: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "gfngfn";
|
||||
repo = "otfm";
|
||||
rev = "v0.3.2+satysfi";
|
||||
sha256 = "1h795pdi5qi2nwymsfvb53x56h9pqi9iiqbzw10mi6fazgd2dzhd";
|
||||
rev = "v0.3.7+satysfi";
|
||||
sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p";
|
||||
};
|
||||
});
|
||||
yojson = ocamlPackages.yojson.overrideAttrs (o: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "gfngfn";
|
||||
repo = "yojson";
|
||||
rev = "v1.4.1+satysfi";
|
||||
sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp";
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "satysfi";
|
||||
version = "0.0.3";
|
||||
version = "0.0.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gfngfn";
|
||||
repo = "SATySFi";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qk284jhxnfb69s24j397a6155dhl4dcgamicin7sq04d0wj6c7f";
|
||||
sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -49,7 +57,7 @@ in
|
|||
|
||||
buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [
|
||||
ocaml findlib menhir
|
||||
batteries camlimages core_kernel ppx_deriving uutf yojson
|
||||
batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -58,13 +66,15 @@ in
|
|||
cp -r ${lm}/* lib-satysfi/dist/fonts/
|
||||
cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/
|
||||
make install PREFIX=$out LIBDIR=$out/share/satysfi
|
||||
mkdir -p $out/share/satysfi/
|
||||
cp -r lib-satysfi/dist/ $out/share/satysfi/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/gfngfn/SATySFi;
|
||||
description = "A statically-typed, functional typesetting system";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = [ maintainers.mt-caret ];
|
||||
maintainers = [ maintainers.mt-caret maintainers.marsam ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1562,6 +1562,8 @@ in
|
|||
|
||||
datasette = with python3Packages; toPythonApplication datasette;
|
||||
|
||||
howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { };
|
||||
|
||||
datefudge = callPackage ../tools/system/datefudge { };
|
||||
|
||||
dateutils = callPackage ../tools/misc/dateutils { };
|
||||
|
|
@ -1880,7 +1882,7 @@ in
|
|||
|
||||
hostsblock = callPackage ../tools/misc/hostsblock { };
|
||||
|
||||
hopper = callPackage ../development/tools/analysis/hopper {};
|
||||
hopper = qt5.callPackage ../development/tools/analysis/hopper {};
|
||||
|
||||
hr = callPackage ../applications/misc/hr { };
|
||||
|
||||
|
|
@ -7364,9 +7366,13 @@ in
|
|||
|
||||
xxkb = callPackage ../applications/misc/xxkb { };
|
||||
|
||||
ugarit = callPackage ../tools/backup/ugarit { };
|
||||
ugarit = callPackage ../tools/backup/ugarit {
|
||||
inherit (chickenPackages_4) eggDerivation fetchegg;
|
||||
};
|
||||
|
||||
ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { };
|
||||
ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker {
|
||||
inherit (chickenPackages_4) eggDerivation fetchegg;
|
||||
};
|
||||
|
||||
unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; };
|
||||
|
||||
|
|
@ -7935,8 +7941,6 @@ in
|
|||
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
||||
inherit (llvmPackages_6) clang llvm;
|
||||
})
|
||||
crystal_0_25
|
||||
crystal_0_26
|
||||
crystal_0_27
|
||||
crystal_0_29
|
||||
crystal_0_30
|
||||
|
|
@ -10682,11 +10686,7 @@ in
|
|||
|
||||
terracognita = callPackage ../development/tools/misc/terracognita { };
|
||||
|
||||
terraform-lsp = callPackage ../development/tools/misc/terraform-lsp {
|
||||
# Version 0.0.5 fails to build with go 1.13 due to dependency:
|
||||
# build github.com/juliosueiras/terraform-lsp: cannot load github.com/googleapis/gax-go/v2: github.com/googleapis/gax-go@v2.0.0+incompatible: reading file:///nix/store/ihiyd3mqa5gvfm2k2716hpl16knak798-terraform-lsp-0.0.5-go-modules/github.com/googleapis/gax-go/@v/v2.0.0+incompatible.zip: Not Found
|
||||
buildGoModule = buildGo112Module;
|
||||
};
|
||||
terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
|
||||
|
||||
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
|
||||
texinfo4 = texinfo413;
|
||||
|
|
@ -15414,7 +15414,7 @@ in
|
|||
miniHttpd = callPackage ../servers/http/mini-httpd {};
|
||||
|
||||
mlflow-server = callPackage ../servers/mlflow-server { };
|
||||
|
||||
|
||||
mlmmj = callPackage ../servers/mail/mlmmj { };
|
||||
|
||||
moodle = callPackage ../servers/web-apps/moodle { };
|
||||
|
|
@ -18039,7 +18039,8 @@ in
|
|||
|
||||
undefined-medium = callPackage ../data/fonts/undefined-medium { };
|
||||
|
||||
uni-vga = callPackage ../data/fonts/uni-vga { };
|
||||
uni-vga = callPackage ../data/fonts/uni-vga
|
||||
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
|
||||
|
||||
unicode-character-database = callPackage ../data/misc/unicode-character-database { };
|
||||
|
||||
|
|
@ -19934,6 +19935,8 @@ in
|
|||
|
||||
kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { };
|
||||
|
||||
kepubify = callPackage ../tools/misc/kepubify { };
|
||||
|
||||
kermit = callPackage ../tools/misc/kermit { };
|
||||
|
||||
kexi = libsForQt5.callPackage ../applications/office/kexi { };
|
||||
|
|
@ -20457,6 +20460,7 @@ in
|
|||
|
||||
mpv = callPackage ../applications/video/mpv {
|
||||
inherit lua;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
|
||||
};
|
||||
|
||||
mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { };
|
||||
|
|
|
|||
|
|
@ -287,6 +287,20 @@ let
|
|||
meta.broken = isPhp74; # Build error
|
||||
};
|
||||
|
||||
pdo_oci = buildPecl rec {
|
||||
inherit (php) src version;
|
||||
|
||||
pname = "pdo_oci";
|
||||
sourceRoot = "php-${version}/ext/pdo_oci";
|
||||
|
||||
buildInputs = [ pkgs.oracle-instantclient ];
|
||||
configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4
|
||||
'';
|
||||
};
|
||||
|
||||
pdo_sqlsrv = buildPecl {
|
||||
version = "5.8.0";
|
||||
pname = "pdo_sqlsrv";
|
||||
|
|
|
|||
|
|
@ -2548,6 +2548,8 @@ in {
|
|||
|
||||
docloud = callPackage ../development/python-modules/docloud { };
|
||||
|
||||
docplex = callPackage ../development/python-modules/docplex { };
|
||||
|
||||
docopt = callPackage ../development/python-modules/docopt { };
|
||||
|
||||
doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue