forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
d9e0820393
|
|
@ -3,21 +3,21 @@
|
|||
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
|
||||
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
|
||||
, fftw, phonon, plasma-framework, threadweaver
|
||||
, curl, ffmpeg_3, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
|
||||
, curl, ffmpeg_3, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "amarok";
|
||||
version = "2.9.0-20190824";
|
||||
pname = "amarok-unstable";
|
||||
version = "2020-06-12";
|
||||
|
||||
src = fetchgit {
|
||||
# master has the Qt5 version as of April 2018 but a formal release has not
|
||||
# yet been made so change this back to the proper upstream when such a
|
||||
# release is out
|
||||
url = "git://anongit.kde.org/amarok.git";
|
||||
url = "https://invent.kde.org/multimedia/amarok.git";
|
||||
# url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
|
||||
rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00";
|
||||
sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j";
|
||||
rev = "fece39b0e81db310b6a6e08f93d83b0d498cd02b";
|
||||
sha256 = "12casnq6w5yp2jlvnr466pjpkn0vriry8jzfq2qkjl564y0vhy9x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
|
@ -26,7 +26,7 @@ mkDerivation rec {
|
|||
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
|
||||
karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
|
||||
phonon plasma-framework threadweaver
|
||||
curl fftw ffmpeg_3 gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
|
||||
curl fftw ffmpeg_3 gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
|
||||
pcre snappy taglib taglib_extras
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergo";
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
|
||||
sha256 = "0vaq6cqz03ps0fg3rvk298jnbf8mazvmyfcj7zsf1cgw41xdjjcf";
|
||||
sha256 = "1a38j7dy6ax9xvcjbdkiz0z33ln4rlmgrxznvqhdf11j70g1sr6x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pueue";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nukesor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1n85b41kvx7x7qdizdnq1p0zrkap4gkwnnvhh4pz6j9njxj8d9ir";
|
||||
sha256 = "06jxj89ya91grrwxfs7l1ahy46y993kxsc8gpkxajc0j5ihax2al";
|
||||
};
|
||||
|
||||
cargoSha256 = "0hkkz74hllc5dzmgls6bgdxsdr871df2fn51sa3shv68ah0avxff";
|
||||
cargoSha256 = "191j3lpd24ycissw0y2hv65i1cjzf24draamq3sxv7hv0sxcjw4d";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.34.0";
|
||||
version = "1.34.2";
|
||||
|
||||
# Update these on version bumps according to Makefile
|
||||
centOsIsoVersion = "v1.15.0";
|
||||
|
|
@ -18,7 +18,7 @@ in buildGoPackage rec {
|
|||
owner = "minishift";
|
||||
repo = "minishift";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nc1g4lmz5ww6rjyyanp9vq4sj6fvi9zf9qjc4lpsmapddhjkdy7";
|
||||
sha256 = "1xzjzmjs2ijg7zzw53v02lgrg1j82jd7ljcn6lprg01hhvfrwgg7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qbec";
|
||||
version = "0.11.2";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "splunk";
|
||||
repo = "qbec";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lf9srkmi7r6p3him19akzag13hj8arwlkm9mdy8a8fg1ascqbm4";
|
||||
sha256 = "0vy1cqqyga68qjbvyhsgl281qkbsvhvmwbxc93hygsxzm9kczy4p";
|
||||
};
|
||||
|
||||
vendorSha256 = "1cyr621fb6hxwswz9lf75brc9qjy1n9rqjkwi6r8s3y6nhw20db6";
|
||||
vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.0.0";
|
||||
version = "3.2.0";
|
||||
|
||||
goPackagePath = "github.com/StackExchange/dnscontrol";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1j8i4k7bqkqmi6dmc9fxfab49a7qigig72rlbga902lw336p6cc7";
|
||||
sha256 = "1lrn1whmx9zkyvs505zxrsmnr5s6kpj3kjkr6rblfwdlnadkgfj7";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "0cdcls0x6f2w99hkjz48hxhnx86w3bnyxzibchdc9yspih770bz2";
|
||||
sha256 = "0wd4cv1c9hqymvml979g607nh3xxmlyx1ifc4r4qf39v6grnsmdi";
|
||||
};
|
||||
|
||||
patches = optional smimeSupport (fetchpatch {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index cc6fa03..7c2b280 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -24,6 +24,7 @@ add_project_arguments(c_args, language: 'c')
|
||||
cc = meson.get_compiler('c')
|
||||
|
||||
libm = cc.find_library('m', required: false)
|
||||
+librt = cc.find_library('rt', required: false)
|
||||
|
||||
pixman = dependency('pixman-1')
|
||||
libuv = dependency('libuv')
|
||||
@@ -65,6 +66,7 @@ sources = [
|
||||
|
||||
dependencies = [
|
||||
libm,
|
||||
+ librt,
|
||||
pixman,
|
||||
libuv,
|
||||
egl,
|
||||
|
|
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0aa12fkbwhzs0g2pqw1b27l33nn5dpbcvsf1z8h88kwsf9xdvb2r";
|
||||
};
|
||||
|
||||
patches = [ ./add-missing-librt.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "version: '0.1.0'" "version: '${version}'"
|
||||
|
|
|
|||
|
|
@ -1,21 +1,37 @@
|
|||
{ stdenv, fetchFromGitHub, dmd, pkgconfig, curl, sqlite, libnotify }:
|
||||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkgconfig
|
||||
, curl, sqlite, libnotify
|
||||
, withSystemd ? stdenv.isLinux, systemd ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "onedrive";
|
||||
version = "2.3.13";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abraunegg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0bcsrfh1g7bdlcp0zjn6np88qzpn5frv61lzxz9b2ayxf7wyybvi";
|
||||
sha256 = "10s33p1xzq9c5n1bxv9n7n31afxgx9i6c17w0xgxdrma75micm3a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dmd pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkgconfig ];
|
||||
|
||||
buildInputs = [ curl sqlite libnotify ];
|
||||
buildInputs = [
|
||||
curl sqlite libnotify
|
||||
] ++ lib.optional withSystemd systemd;
|
||||
|
||||
configureFlags = [ "--enable-notifications" ];
|
||||
configureFlags = [
|
||||
"--enable-notifications"
|
||||
] ++ lib.optionals withSystemd [
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
|
||||
];
|
||||
|
||||
# we could also pass --enable-completions to configure but we would then have to
|
||||
# figure out the paths manually and pass those along.
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name ${pname} contrib/completions/complete.bash
|
||||
installShellCompletion --zsh --name _${pname} contrib/completions/complete.zsh
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A complete tool to interact with OneDrive on Linux";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picard-tools";
|
||||
version = "2.22.9";
|
||||
version = "2.23.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "0qm32a58b2asiw8rnw1r6vz3bi61vfdan6wyr9f78fj4d07q7n53";
|
||||
sha256 = "0yhgfz5jjw55ipgdb32wjdcb01xx2g9ikgvwinnfwswx50iscf5a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.20.5";
|
||||
version = "3.20.6";
|
||||
pname = "libdap";
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "15jysnsmdjs7q4iafb4qzq4b76cfyvmbxgcxnqg4sr0x4bplwfnb";
|
||||
sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,27 +1,24 @@
|
|||
{ stdenv, fetchurl, pkgconfig, which, cmake
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake
|
||||
, fftwSinglePrec, libsamplerate, qtbase
|
||||
, darwin }:
|
||||
|
||||
let version = "1.1.0"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblastfm";
|
||||
inherit version;
|
||||
pname = "liblastfm-unstable";
|
||||
version = "2019-08-23";
|
||||
|
||||
# Upstream does not package git tags as tarballs. Get tarball from github.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lastfm/liblastfm/tarball/${version}";
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lastfm";
|
||||
repo = "liblastfm";
|
||||
rev = "2ce2bfe1879227af8ffafddb82b218faff813db9";
|
||||
sha256 = "1crih9xxf3rb109aqw12bjqv47z28lvlk2dpvyym5shf82nz6yd0";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'find_package(Qt5Core QUIET)' \
|
||||
'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)'
|
||||
'';
|
||||
patches = [(fetchpatch {
|
||||
url = "https://github.com/lastfm/liblastfm/commit/9c5d072b55f2863310e40291677e6397e9cbc3c2.patch";
|
||||
name = "0001-Remove-deprecated-staging-server-and-fix-test-for-QT5-at-Ubuntu-19.10.patch";
|
||||
sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l";
|
||||
})];
|
||||
|
||||
prefixKey = "--prefix ";
|
||||
nativeBuildInputs = [ pkgconfig which cmake ];
|
||||
buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
|
||||
|
|
@ -31,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
repositories.git = "git://github.com/lastfm/liblastfm.git";
|
||||
description = "Official LastFM library";
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.phreedom ];
|
||||
maintainers = [ maintainers.phreedom ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librealsense";
|
||||
version = "2.34.0";
|
||||
version = "2.35.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "IntelRealSense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0bi7pszrryz18aqna0z73mb1hzz2vqdb0m00pf93hnwc2hba7hwm";
|
||||
sha256 = "14vf76vlyhh7b4yjzsnqpg1x3wdhwxrf1syvgf8wyxbjwb9plw82";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trompeloeil";
|
||||
version = "37";
|
||||
version = "38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rollbear";
|
||||
repo = "trompeloeil";
|
||||
rev = "v${version}";
|
||||
sha256 = "04f9vpzh4fc15w4ynirzs9ipm9r31dbggb2zilmk0fj4qr79am42";
|
||||
sha256 = "068q4xx09vwjs7i89w47qzymdb4l6jqi27gx2jmd3yb6fp2k7nsb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "0.19.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liamg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ddyvkv0949p0b6m1rwai5r87mca5xwyjwsjq7gbyqz9h10bv7nf";
|
||||
sha256 = "0mmh161zwrkjwpw01zcgh7hsap7lgdxhg191bajzig6vlq287jyh";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/liamg/tfsec";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "delve";
|
||||
version = "1.2.0";
|
||||
version = "1.4.1";
|
||||
|
||||
goPackagePath = "github.com/go-delve/delve";
|
||||
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
|
||||
|
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
owner = "go-delve";
|
||||
repo = "delve";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xz1xm0lb1arwm3w2ydq5y5xglq60fc0q46x9xndr3i9j0rm8bxh";
|
||||
sha256 = "007bc69r26w0sv6v9mbjdnmnkahpfk5998isx81ma7cinqdhi1cj";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "gauge";
|
||||
version = "1.0.4";
|
||||
version = "1.1.1";
|
||||
|
||||
goPackagePath = "github.com/getgauge/gauge";
|
||||
excludedPackages = ''\(build\|man\)'';
|
||||
|
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
owner = "getgauge";
|
||||
repo = "gauge";
|
||||
rev = "v${version}";
|
||||
sha256 = "1b52kpv5561pyjvqi8xmidarqp6lcyyy4sjsl4qjx4cr7hmk8kc7";
|
||||
sha256 = "01x4838jljhhhcwfh6zbhy3g7l7nqvypv3g0ch9n2amsf2s16s3l";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
|
||||
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "js_of_ocaml";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src installPhase meta;
|
||||
|
||||
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
|
||||
nativeBuildInputs = [ ocaml findlib dune ];
|
||||
|
||||
postPatch = "patchShebangs lib/generate_stubs.sh";
|
||||
|
||||
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
|
||||
|
||||
buildPhase = "dune build -p js_of_ocaml";
|
||||
}
|
||||
|
|
@ -1,40 +1,18 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild
|
||||
, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson
|
||||
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
|
||||
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
|
||||
}:
|
||||
|
||||
let version = if stdenv.lib.versionAtLeast ocaml.version "4.02"
|
||||
then "2.8.4" else "2.7";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "js_of_ocaml";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz";
|
||||
sha256 = {
|
||||
"2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
|
||||
"2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl";
|
||||
}.${version};
|
||||
};
|
||||
pname = "js_of_ocaml";
|
||||
|
||||
buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild
|
||||
cmdliner reactivedata cppo which base64 ]
|
||||
++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ];
|
||||
propagatedBuildInputs = [ lwt camlp4 ppx_deriving ]
|
||||
++ stdenv.lib.optional (version == "2.8.4") uchar;
|
||||
inherit (js_of_ocaml-compiler) version src installPhase meta;
|
||||
|
||||
patches = [ ./Makefile.conf.diff ];
|
||||
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
|
||||
nativeBuildInputs = [ ocaml findlib dune ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
postPatch = "patchShebangs lib/generate_stubs.sh";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://ocsigen.org/js_of_ocaml/";
|
||||
description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser";
|
||||
license = licenses.lgpl2;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
maintainers = [
|
||||
maintainers.gal_bolle
|
||||
];
|
||||
broken = versionAtLeast ocaml.version "4.05";
|
||||
};
|
||||
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
|
||||
|
||||
buildPhase = "dune build -p js_of_ocaml";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "skaffold";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
# rev is the ${version} commit, mainly for skaffold version command output
|
||||
rev = "931a70a6334436735bfc4ff7633232dd5fc73cc1";
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ buildGoPackage rec {
|
|||
owner = "GoogleContainerTools";
|
||||
repo = "skaffold";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qi4b0304jjpv5npa5yfrrfg7yv5p838qqql3sgx4f47ysyyq0as";
|
||||
sha256 = "035xp34m8kzb75mivgf3kw026n2h6g2a7j2mi32nxl1a794w36zi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, steamArch, fetchurl, }:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
|
|
@ -6,20 +6,15 @@ stdenv.mkDerivation rec {
|
|||
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/
|
||||
version = "0.20200417.0";
|
||||
|
||||
src =
|
||||
if steamArch == "amd64" then fetchurl {
|
||||
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-amd64,i386-scout-runtime.tar.gz";
|
||||
sha256 = "0kps8i5v23sycqm69xz389n8k831jd7ncsmlrkky7nib2q91rbvj";
|
||||
name = "scout-runtime-${version}.tar.gz";
|
||||
} else fetchurl {
|
||||
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-i386-scout-runtime.tar.gz";
|
||||
sha256 = "03fhac1r25xf7ia2pd35wjw360v5pa9h4870yrhhygp9h7v4klzf";
|
||||
name = "scout-runtime-i386-${version}.tar.gz";
|
||||
};
|
||||
src = fetchurl {
|
||||
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
|
||||
sha256 = "0d4dfl6i31i8187wj8rr9yvmrg32bx96bsgs2ya21b00czf070sy";
|
||||
name = "scout-runtime-${version}.tar.gz";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out
|
||||
tar -C $out -x --strip=1 -f $src files/
|
||||
tar -C $out --strip=1 -x -f $src
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
rev = "v${version}";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph";
|
||||
sha256 = "0yx0ry8gwgvw1mkz3nv4rn2pwslm0q7jxlk70gaw6386mxxmj0sk";
|
||||
};
|
||||
|
||||
passthru.tests.consul = nixosTests.consul;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
});
|
||||
in pythonPackages.buildPythonApplication rec {
|
||||
pname = "video2midi";
|
||||
version = "0.4.0.1";
|
||||
version = "0.4.0.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec {
|
|||
owner = "svsdval";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1869w60kprjdikqk4iwx058zri2jg4aznzlg668w9myka4mp01r9";
|
||||
sha256 = "174ijn8bc306529scd23szvgx1apanm2qmwk4lwmi64rhkm6dapx";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rmlint";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sahib";
|
||||
repo = "rmlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "1r7j1bmm83p6wdw0jhvkm4sa568r534zsy45bvas7qq4433jl019";
|
||||
sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x";
|
||||
};
|
||||
|
||||
CFLAGS="-I${stdenv.lib.getDev utillinux}/include";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "topgrade";
|
||||
version = "4.5.0";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "r-darwish";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0df79vlbclv1qx4zwir728c6ggqfawxh2x1py16m5q0ga1hd799j";
|
||||
sha256 = "1hg03mj3rd778hq1856139nwz7y5gykwvg7xhxlsiabv7gr06m2m";
|
||||
};
|
||||
|
||||
cargoSha256 = "0wwxh71i94h68sryckbvrr43gd19qjcs0cgcpycnimkhdcdy8nlj";
|
||||
cargoSha256 = "14qv2157jhj7hilvqi3c00p11rzv0vvimr4d34nyspgzxz2si6sm";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Foundation;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "keycard-cli";
|
||||
version = "0.0.12";
|
||||
version = "0.4.0";
|
||||
|
||||
goPackagePath = "github.com/status-im/keycard-cli";
|
||||
subPackages = [ "." ];
|
||||
|
|
@ -14,7 +14,7 @@ buildGoPackage rec {
|
|||
owner = "status-im";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1jnbaq57i6i9bad1hcvd28mxfqq6v8rv806c6l74vlb79ff4v1wb";
|
||||
sha256 = "0917vl5lw8wgvyn5l8q6xa8bqh342fibaa38syr8hmz8b09qkh38";
|
||||
};
|
||||
|
||||
buildFlagsArray = [
|
||||
|
|
|
|||
|
|
@ -252,6 +252,7 @@ mapAliases ({
|
|||
libjpeg_drop = libjpeg_original; # added 2020-06-05
|
||||
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
|
||||
liblapackWithoutAtlas = lapack-reference; # added 2018-11-05
|
||||
liblastfm = libsForQt5.liblastfm; # added 2020-06-14
|
||||
liblrdf = lrdf; # added 2018-04-25
|
||||
libqrencode = qrencode; # added 2019-01-01
|
||||
librdf = lrdf; # added 2020-03-22
|
||||
|
|
|
|||
|
|
@ -13082,8 +13082,6 @@ in
|
|||
|
||||
liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
|
||||
|
||||
liblastfm = libsForQt5.callPackage ../development/libraries/liblastfm { };
|
||||
|
||||
liblcf = callPackage ../development/libraries/liblcf { };
|
||||
|
||||
liblqr1 = callPackage ../development/libraries/liblqr-1 { };
|
||||
|
|
@ -14357,6 +14355,8 @@ in
|
|||
|
||||
libktorrent = callPackage ../development/libraries/libktorrent { };
|
||||
|
||||
liblastfm = callPackage ../development/libraries/liblastfm { };
|
||||
|
||||
libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };
|
||||
|
||||
libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
|
||||
|
|
|
|||
|
|
@ -401,15 +401,7 @@ let
|
|||
|
||||
jingoo = callPackage ../development/ocaml-modules/jingoo { };
|
||||
|
||||
js_of_ocaml =
|
||||
if lib.versionOlder "4.02" ocaml.version
|
||||
then callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { }
|
||||
else js_of_ocaml_2;
|
||||
|
||||
js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml {
|
||||
base64 = base64_2;
|
||||
lwt = lwt2;
|
||||
};
|
||||
js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { };
|
||||
|
||||
js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {};
|
||||
|
||||
|
|
|
|||
|
|
@ -13858,6 +13858,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
NetIPLite = buildPerlPackage {
|
||||
pname = "Net-IP-Lite";
|
||||
version = "0.03";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/A/AL/ALEXKOM/Net-IP-Lite-0.03.tar.gz";
|
||||
sha256 = "c9916e6cfaa53be275379ce4b2a550ae176ddfab50dad43b43ed43e8267802a9";
|
||||
};
|
||||
buildInputs = [ TestException ];
|
||||
meta = {
|
||||
homepage = "https://metacpan.org/pod/Net::IP::Lite";
|
||||
description = "Perl extension for manipulating IPv4/IPv6 addresses";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
NetIPv4Addr = buildPerlPackage {
|
||||
pname = "Net-IPv4Addr";
|
||||
version = "0.10";
|
||||
|
|
|
|||
Loading…
Reference in a new issue