Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
f137783927
92 changed files with 820 additions and 418 deletions
|
|
@ -514,6 +514,11 @@
|
|||
github = "avnik";
|
||||
name = "Alexander V. Nikolaev";
|
||||
};
|
||||
aw = {
|
||||
email = "aw-nixos@meterriblecrew.net";
|
||||
github = "herrwiese";
|
||||
name = "Andreas Wiese";
|
||||
};
|
||||
aycanirican = {
|
||||
email = "iricanaycan@gmail.com";
|
||||
github = "aycanirican";
|
||||
|
|
|
|||
|
|
@ -37,6 +37,11 @@ with lib;
|
|||
|
||||
security.pam.services.login.enableGnomeKeyring = true;
|
||||
|
||||
security.wrappers.gnome-keyring-daemon = {
|
||||
source = "${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon";
|
||||
capabilities = "cap_ipc_lock=ep";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "drumkv1-${version}";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
|
||||
sha256 = "0d0kskr9pzdckw7sz4djjkkkgz1fa83zrq5my6qlxn68wqdj6800";
|
||||
sha256 = "1361dqdasrc98q9hcjdwsjx6agfimwnay430887fryi3pslkyd81";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "infamousPlugins-${version}";
|
||||
version = "0.2.04";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ssj71";
|
||||
repo = "infamousPlugins";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hmqk80w4qxq09iag7b7srf2g0wigkyhzq0ywxvhz2iz0hq9k0dh";
|
||||
sha256 = "1r72agk5nxf5k0mghcc2j90z43j5d9i7rqjmf49jfyqnd443isip";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
let
|
||||
versions = {
|
||||
atom = {
|
||||
version = "1.36.0";
|
||||
sha256 = "1ljg39h5xjigk2njvxyinb1gd3sbja21v47c7va6vl9hjr5xb3fr";
|
||||
version = "1.36.1";
|
||||
sha256 = "1m7q2r3zx463k7kpqb364piqrr69wrhs033ibzxdx9y7r4204qp4";
|
||||
};
|
||||
|
||||
atom-beta = {
|
||||
|
|
|
|||
|
|
@ -75,7 +75,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = [ "--with-modules" ] ++
|
||||
configureFlags = [
|
||||
"--disable-build-details" # for a (more) reproducible build
|
||||
"--with-modules"
|
||||
] ++
|
||||
(lib.optional stdenv.isDarwin
|
||||
(lib.withFeature withNS "ns")) ++
|
||||
(if withNS
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "1.34.1";
|
||||
version = "1.35";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.geany.org/${name}.tar.bz2";
|
||||
sha256 = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11";
|
||||
sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool libintl ];
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "avocode-${version}";
|
||||
version = "3.7.0";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
|
||||
sha256 = "165g63w605fnirwrgqsldmq2gpb1v65dmfx6niy5and7h9j260gp";
|
||||
sha256 = "0qwghs9q91ifywvrn8jgnnqzfrbbsi4lf92ikxq0dmdv734pdw0c";
|
||||
};
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath (with xorg; [
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
, wrapGAppsHook
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "solvespace-2.3-20180906";
|
||||
rev = "258545a334098cf25c1c9f4cd59b778dfe0b0d29";
|
||||
name = "solvespace-2.3-20190501";
|
||||
rev = "e7b75f19c34c923780db776592b47152650d8f22";
|
||||
src = fetchgit {
|
||||
url = https://github.com/solvespace/solvespace;
|
||||
inherit rev;
|
||||
sha256 = "1wimh6l0zpk0vywcsd2minijjf6g550z8i3l8lpmfnl5przymc2v";
|
||||
sha256 = "07k4mbzxf0dmzwdhjx5nc09y7rn1schkaypsw9kz0l7ppylprpp2";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.41.3";
|
||||
version = "3.42.0";
|
||||
name = "calibre-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
|
||||
sha256 = "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra";
|
||||
sha256 = "0ymdhws3cb44p3fb24vln1wx6s7qnb8rr241jvm6qbj5rnp984dm";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@ with python'.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "FlexGet";
|
||||
version = "2.20.17";
|
||||
version = "2.20.22";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ed021d8d5c10555dad8dc1cb93c012e17b541fc25fc122b7ca76bb7e53fe82b3";
|
||||
sha256 = "1bk1ab7ivb6fikqw4v1f9df6brplgg4ybbn8d3vzgjabm5ic21nd";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
name = "baresip-${version}";
|
||||
src=fetchurl {
|
||||
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
|
||||
sha256 = "1nfqdhnnnh5g552d8klv61j98arr84b3fbhvynv6y1mxfp5candm";
|
||||
sha256 = "1qi8im5sc3jbpic1sn46mmd98y0pckpnngf4n8dqdp76m4gf3yp1";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [zlib openssl libre librem cairo mpg123
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jmeter-${version}";
|
||||
version = "5.1";
|
||||
version = "5.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
|
||||
sha256 = "04n7srrg47iyrzhskm2w5g8pd8269kjsly5ixsgifl6aqcbvxpcz";
|
||||
sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
chronic (0.9.1)
|
||||
gpgme (2.0.12)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
highline (1.7.8)
|
||||
gpgme (2.0.18)
|
||||
mini_portile2 (~> 2.3)
|
||||
highline (2.0.2)
|
||||
locale (2.1.2)
|
||||
lockfile (2.1.3)
|
||||
mime-types (3.0)
|
||||
mime-types (3.2.2)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0221)
|
||||
mini_portile2 (2.1.0)
|
||||
ncursesw (1.4.9)
|
||||
rake (11.1.2)
|
||||
mime-types-data (3.2019.0331)
|
||||
mini_portile2 (2.4.0)
|
||||
ncursesw (1.4.10)
|
||||
rake (12.3.2)
|
||||
rmail-sup (1.0.1)
|
||||
sup (0.22.1)
|
||||
chronic (~> 0.9.1)
|
||||
|
|
@ -24,8 +24,8 @@ GEM
|
|||
rmail-sup (~> 1.0.1)
|
||||
trollop (>= 1.12)
|
||||
unicode (~> 0.4.4)
|
||||
trollop (2.1.2)
|
||||
unicode (0.4.4.2)
|
||||
trollop (2.9.9)
|
||||
unicode (0.4.4.4)
|
||||
xapian-ruby (1.2.22)
|
||||
|
||||
PLATFORMS
|
||||
|
|
@ -38,4 +38,4 @@ DEPENDENCIES
|
|||
xapian-ruby (~> 1.2.22)
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.6
|
||||
1.17.2
|
||||
|
|
|
|||
|
|
@ -1,23 +1,30 @@
|
|||
{ lib, bundlerEnv, ruby }:
|
||||
{ lib, bundlerApp, rake, which }:
|
||||
|
||||
bundlerEnv {
|
||||
name = "sup-0.22.1";
|
||||
# Updated with:
|
||||
# rm gemset.nix Gemfile.lock
|
||||
# nix-shell -p bundler bundix --run 'bundle lock && bundix'
|
||||
|
||||
inherit ruby;
|
||||
|
||||
# Updated with:
|
||||
# nix-shell -p bundix -p bundler -p ncurses -p ruby -p which -p zlib -p libuuid
|
||||
# bundle install --path ./vendor
|
||||
# bundix
|
||||
gemfile = ./Gemfile;
|
||||
lockfile = ./Gemfile.lock;
|
||||
gemset = ./gemset.nix;
|
||||
bundlerApp {
|
||||
pname = "sup";
|
||||
gemdir = ./.;
|
||||
exes = [
|
||||
"sup"
|
||||
"sup-add"
|
||||
"sup-config"
|
||||
"sup-dump"
|
||||
"sup-import-dump"
|
||||
"sup-psych-ify-config-files"
|
||||
"sup-recover-sources"
|
||||
"sup-sync"
|
||||
"sup-sync-back-maildir"
|
||||
"sup-tweak-labels"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A curses threads-with-tags style email client";
|
||||
homepage = http://sup-heliotrope.github.io;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ cstrahan lovek323 ];
|
||||
maintainers = with maintainers; [ cstrahan lovek323 manveru ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,126 +1,155 @@
|
|||
{
|
||||
xapian-ruby = {
|
||||
version = "1.2.22";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15";
|
||||
};
|
||||
dependencies = [ "rake" ];
|
||||
};
|
||||
unicode = {
|
||||
version = "0.4.4.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15fggljzan8zvmr8h12b5m7pcj1gvskmmnx367xs4p0rrpnpil8g";
|
||||
};
|
||||
};
|
||||
trollop = {
|
||||
version = "2.1.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
|
||||
};
|
||||
};
|
||||
sup = {
|
||||
version = "0.22.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi";
|
||||
};
|
||||
dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode" "rake" ];
|
||||
};
|
||||
rmail-sup = {
|
||||
version = "1.0.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
|
||||
};
|
||||
};
|
||||
rake = {
|
||||
version = "11.1.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jfmy7kd543ldi3d4fg35a1w7q6jikpnzxqj4bzchfbn94cbabqz";
|
||||
};
|
||||
};
|
||||
ncursesw = {
|
||||
version = "1.4.9";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093";
|
||||
};
|
||||
};
|
||||
mini_portile2 = {
|
||||
version = "2.1.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
|
||||
};
|
||||
};
|
||||
mime-types-data = {
|
||||
version = "3.2016.0221";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05ygjn0nnfh6yp1wsi574jckk95wqg9a6g598wk4svvrkmkrzkpn";
|
||||
};
|
||||
};
|
||||
mime-types = {
|
||||
version = "3.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1snjc38a9vqvy8j41xld1i1byq9prbl955pbjw7dxqcfcirqlzra";
|
||||
};
|
||||
dependencies = ["mime-types-data"];
|
||||
};
|
||||
lockfile = {
|
||||
version = "2.1.3";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
|
||||
};
|
||||
};
|
||||
locale = {
|
||||
version = "2.1.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
|
||||
};
|
||||
};
|
||||
highline = {
|
||||
version = "1.7.8";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
|
||||
};
|
||||
};
|
||||
gpgme = {
|
||||
version = "2.0.12";
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0a04a76dw9dias0a8rp6dyk3vx2y024gim40lg2md6zdh2m1kx85";
|
||||
};
|
||||
dependencies = ["mini_portile2"];
|
||||
};
|
||||
chronic = {
|
||||
version = "0.9.1";
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
type = "gem";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.1";
|
||||
};
|
||||
gpgme = {
|
||||
dependencies = ["mini_portile2"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.18";
|
||||
};
|
||||
highline = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1g0zpalfj8wvca86hcnirir5py2zyqrhkgdgv9f87fxkjaw815wr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.2";
|
||||
};
|
||||
locale = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.2";
|
||||
};
|
||||
lockfile = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.3";
|
||||
};
|
||||
mime-types = {
|
||||
dependencies = ["mime-types-data"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.2";
|
||||
};
|
||||
mime-types-data = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2019.0331";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
};
|
||||
ncursesw = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nc14wls1yiigz593vw7580hb99lf4n485axapiz6sqpg1jnlhcr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.10";
|
||||
};
|
||||
rake = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "12.3.2";
|
||||
};
|
||||
rmail-sup = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
sup = {
|
||||
dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.22.1";
|
||||
};
|
||||
trollop = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "074h7lns72kg1dl5gvz5apl3xz1i0axbnbc01pf2kbw4q0lkpnp4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.9.9";
|
||||
};
|
||||
unicode = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.4.4";
|
||||
};
|
||||
xapian-ruby = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.22";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.1.01";
|
||||
version = "4.1.03";
|
||||
pname = "fldigi";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1pznq18rv8q7qflpnnk6wvbwfqvhvyx1a77jlp3kzjh19pjaqldy";
|
||||
sha256 = "1d3m4xj237z89y691kmzh8ghwcznwjnp7av9ndzlkl1as1641n9p";
|
||||
};
|
||||
|
||||
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
pname = "fllog";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fldigi/${name}.tar.gz";
|
||||
sha256 = "042j1g035338vfbl4i9laai8af8iakavar05xn2m4p7ww6x76zzl";
|
||||
sha256 = "18nwqbbg5khpkwlr7dn41g6zf7ms2wzxykd42fwdsj4m4z0ysyyg";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3.42";
|
||||
version = "1.3.43";
|
||||
pname = "flrig";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
|
||||
sha256 = "10qn710ms145zq2xzb6z2fnygxmh5pmfmyfdbphrc7mrvd0phzp0";
|
||||
sha256 = "1ir47svjbz7dhgzxvb3xqnkcsnjqb935vhqfddx7yhaawiqrzhk1";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bowtie2";
|
||||
version = "2.3.5";
|
||||
version = "2.3.5.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BenLangmead";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12v240wnbc541hl4z2fiymxd3bd6czazs13fjkygldflg48w45m0";
|
||||
sha256 = "1l1f0yhjqqvy4lpxfml1xwv7ayimwbpzazvp0281gb4jb5f5mr1a";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib tbb python perl ];
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@ let
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.29.36";
|
||||
version = "14.29.40";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "0f4wxlfxg7pd9lkphfsdq60p18ss1z2hkqvv95a1nn8nnivvs9c6";
|
||||
sha256 = "17skd67i6l7k96g2ddq0s0xkji8wmfr2z31j345ws9kdr0faw01x";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,16 +1,31 @@
|
|||
{ wxGTK, lib, stdenv, fetchurl, cmake, libGLU_combined, zlib
|
||||
{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU_combined, zlib
|
||||
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
|
||||
, doxygen, pcre, libpthreadstubs, libXdmcp
|
||||
, wrapGAppsHook
|
||||
, oceSupport ? true, opencascade
|
||||
, ngspiceSupport ? true, libngspice
|
||||
, swig, python, pythonPackages
|
||||
, lndir
|
||||
}:
|
||||
|
||||
assert ngspiceSupport -> libngspice != null;
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
mkLib = version: name: sha256: attrs: stdenv.mkDerivation ({
|
||||
name = "kicad-${name}-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "KiCad";
|
||||
repo = "kicad-${name}";
|
||||
rev = "${version}";
|
||||
inherit sha256 name;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
} // attrs);
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "kicad-${version}";
|
||||
series = "5.0";
|
||||
version = "5.0.2";
|
||||
|
|
@ -41,12 +56,13 @@ stdenv.mkDerivation rec {
|
|||
pkgconfig
|
||||
wrapGAppsHook
|
||||
pythonPackages.wrapPython
|
||||
lndir
|
||||
];
|
||||
pythonPath = [ pythonPackages.wxPython ];
|
||||
propagatedBuildInputs = [ pythonPackages.wxPython ];
|
||||
|
||||
buildInputs = [
|
||||
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
|
||||
libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
|
||||
cairo curl openssl boost
|
||||
swig python
|
||||
] ++ optional (oceSupport) opencascade
|
||||
|
|
@ -55,6 +71,37 @@ stdenv.mkDerivation rec {
|
|||
# this breaks other applications in kicad
|
||||
dontWrapGApps = true;
|
||||
|
||||
passthru = {
|
||||
i18n = mkLib version "i18n" "1hkc240gymhmyv6r858mq5d2slz0vjqc47ah8wn82vvmb83fpnjy" {
|
||||
buildInputs = [
|
||||
gettext
|
||||
];
|
||||
meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3
|
||||
};
|
||||
symbols = mkLib version "symbols" "1rjh2pjcrc3bhcgyyskj5pssm7vffrjk0ymwr70fb7sjpmk96yjk" {
|
||||
meta.license = licenses.cc-by-sa-40;
|
||||
};
|
||||
footprints = mkLib version "footprints" "19khqyrbrqsdzxvm1b1vxfscxhss705fqky0ilrbvnbvf27fnx8w" {
|
||||
meta.license = licenses.cc-by-sa-40;
|
||||
};
|
||||
templates = mkLib version "templates" "0rlzq1n09n0sf2kj5c9bvbnkvs6cpycjxmxwcswql0fbpcp0sql7" {
|
||||
meta.license = licenses.cc-by-sa-40;
|
||||
};
|
||||
packages3d = mkLib version "packages3d" "135jyrljgknnv2y35skhnwcxg16yxxkfbcx07nad3vr4r76zk3am" {
|
||||
hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store
|
||||
meta.license = licenses.cc-by-sa-40;
|
||||
};
|
||||
};
|
||||
|
||||
modules = with passthru; [ i18n symbols footprints templates ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
for module in $modules; do
|
||||
lndir $module/share $out/share
|
||||
done
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eprover-${version}";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz";
|
||||
sha256 = "08ihpwgkz0l7skr42iw8lm202kqr51i792bs61qsbnk9gsjlab1c";
|
||||
sha256 = "15pbmi195812a2pwrvfa4gwad0cy7117d5kaw98651g6fzgd4rjk";
|
||||
};
|
||||
|
||||
buildInputs = [ which ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ginac-1.7.5";
|
||||
name = "ginac-1.7.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/${name}.tar.bz2";
|
||||
sha256 = "11v8dpdfq8ybbbadyakp19xc7jgckplbbj6q2hh1c2hj5ps6njz7";
|
||||
sha256 = "03cq93qjfgxgr7zxadrjfbn43lk5f0x2lmd90ggx10p6jq47157v";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cln ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-gtk";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "00q6y9dgg9wgpgks79snbipn8alfjajlx02a5hm7wl9a20zd0b81";
|
||||
sha256 = "1ayhzsxf2qgs4j1j0xl942ysfy3zl2z1fp7l2s5nh5awr41mhnqc";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gromacs-2019.1";
|
||||
name = "gromacs-2019.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.1.tar.gz";
|
||||
sha256 = "1v438nf6viwpl53ydrljf598cf8lh7jqxp5bzi74rrnhzk97xhxj";
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.2.tar.gz";
|
||||
sha256 = "0zlzzg27yzfbmmgy2wqmgq82nslqy02gprjvm9xwcswjf705rgxw";
|
||||
};
|
||||
|
||||
buildInputs = [cmake fftw]
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ with stdenv; with lib;
|
|||
mkDerivation rec {
|
||||
name = "cvs-fast-export-${meta.version}";
|
||||
meta = {
|
||||
version = "1.47";
|
||||
version = "1.48";
|
||||
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.47.tar.gz";
|
||||
sha256 = "08kll7jlak26asvnqgwbkci3d6irvy96ijjl7fmck6h7i5mx5lz7";
|
||||
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.48.tar.gz";
|
||||
sha256 = "16gw24y5x96mx6zby8cys0f03x1bqw4r7g1390qlpg75pbydqlf9";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "makemkv-${ver}";
|
||||
ver = "1.14.1";
|
||||
ver = "1.14.3";
|
||||
builder = ./builder.sh;
|
||||
|
||||
# Using two URLs as the first one will break as soon as a new version is released
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
"http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"
|
||||
"http://www.makemkv.com/download/old/makemkv-bin-${ver}.tar.gz"
|
||||
];
|
||||
sha256 = "1n4gjb1531gkvnjzipw63v3zdxmrq5nai9nn6m2ix3lskksjrrhp";
|
||||
sha256 = "1d1b7rppbxx2b9p1smf0nlgp47j8b1z8d7q0v82kwr4qxaa0xcg0";
|
||||
};
|
||||
|
||||
src_oss = fetchurl {
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
"http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"
|
||||
"http://www.makemkv.com/download/old/makemkv-oss-${ver}.tar.gz"
|
||||
];
|
||||
sha256 = "0ysb0nm11vp2ni838p5q3gqan5nrqbr7rz0h24j8p62827pib3pw";
|
||||
sha256 = "1jgyp6qs8r0z26258mvyg9dx7qqqdqrdsziw6m24ka77zpfg4b12";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, fetchurl, makeDesktopItem, pkgconfig, cmake, python3
|
||||
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, cmake, python3
|
||||
, libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras
|
||||
, libvdpau, SDL2, mpv, libGL }:
|
||||
let
|
||||
|
|
@ -50,16 +50,6 @@ in stdenv.mkDerivation rec {
|
|||
buildInputs = [ libX11 libXrandr qtbase qtwebchannel qtwebengine qtx11extras
|
||||
libvdpau SDL2 mpv libGL ];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "plex-media-player";
|
||||
exec = "plexmediaplayer";
|
||||
icon = "plex-media-player";
|
||||
comment = "View your media";
|
||||
desktopName = "Plex Media Player";
|
||||
genericName = "Media Player";
|
||||
categories = "AudioVideo;Video;Player;TV;";
|
||||
};
|
||||
|
||||
preConfigure = with depSrcs; ''
|
||||
mkdir -p build/dependencies
|
||||
ln -s ${webClient} build/dependencies/buildid-${webClientBuildId}.cmake
|
||||
|
|
@ -69,12 +59,6 @@ in stdenv.mkDerivation rec {
|
|||
ln -s ${webClientTv} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{applications,pixmaps}
|
||||
cp ${src}/resources/images/icon.png $out/share/pixmaps/plex-media-player.png
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ let
|
|||
buildType = "release";
|
||||
# Remember to change the extpackRev and version in extpack.nix and
|
||||
# guest-additions/default.nix as well.
|
||||
main = "0rylf1g0vmv0q19iyvyq4dj5h9yvyqqnmmqaqrx93qrv8s1ybssd";
|
||||
version = "5.2.26";
|
||||
main = "0jmrbyhs92lyarpvylxqn2ajxdg9b290w5nd4g0i4h83d28bwbw0";
|
||||
version = "5.2.28";
|
||||
in stdenv.mkDerivation {
|
||||
name = "virtualbox-${version}";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
with lib;
|
||||
|
||||
let version = "5.2.26";
|
||||
let version = "5.2.28";
|
||||
in
|
||||
fetchurl rec {
|
||||
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
|
||||
|
|
@ -10,7 +10,7 @@ fetchurl rec {
|
|||
sha256 =
|
||||
# Manually sha256sum the extensionPack file, must be hex!
|
||||
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
|
||||
let value = "4b7caa9b722840d49f154c3e5efb6463b1b7129f09973a25813dfdbccd9debb7";
|
||||
let value = "376e07cbf2ff2844c95c800346c8e4697d7bc671ae0e21e46153b2e7b4ccc1d6";
|
||||
in assert (builtins.stringLength value) == 64; value;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "0f3w9wjd5aj2khzqh37vdg86wqbbx4gx9aidaai9syn9sk8ca9xr";
|
||||
sha256 = "0cwdmdgcd1jysyw7c9b3cdk1ngk5nq7slh1zkhxkvvq142cnm1v9";
|
||||
};
|
||||
|
||||
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
|
|
|
|||
32
pkgs/data/fonts/d2coding/default.nix
Normal file
32
pkgs/data/fonts/d2coding/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, fetchzip, unzip }:
|
||||
|
||||
let
|
||||
version = "1.3.2";
|
||||
pname = "d2codingfont";
|
||||
|
||||
in fetchzip rec {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile \*-all.ttc -d $out/share/fonts/truetype/
|
||||
'';
|
||||
|
||||
sha256 = "1812r82530wzfki7k9cm35fy6k2lvis7j6w0w8svc784949m1wwj";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Monospace font with support for Korean and latin characters";
|
||||
longDescription = ''
|
||||
D2Coding is a monospace font developed by a Korean IT Company called Naver.
|
||||
Font is good for displaying both Korean characters and latin characters,
|
||||
as sometimes these two languages could share some similar strokes.
|
||||
Since verion 1.3, D2Coding font is officially supported by the font
|
||||
creator, with symbols for Powerline.
|
||||
'';
|
||||
homepage = https://github.com/naver/d2codingfont;
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
}
|
||||
25
pkgs/data/fonts/nanum-gothic-coding/default.nix
Normal file
25
pkgs/data/fonts/nanum-gothic-coding/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, fetchzip, unzip}:
|
||||
|
||||
let
|
||||
version = "VER2.5";
|
||||
fullName = "NanumGothicCoding-2.5";
|
||||
|
||||
in fetchzip rec {
|
||||
name = "nanum-gothic-coding";
|
||||
url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/NanumGothicCoding
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/NanumGothicCoding
|
||||
'';
|
||||
|
||||
sha256 = "0b3pkhd6xn6393zi0dhj3ah08w1y1ji9fl6584bi0c8lanamf2pc";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A contemporary monospaced sans-serif typeface with a warm touch";
|
||||
homepage = https://github.com/naver/nanumfont;
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ linarcx ];
|
||||
};
|
||||
}
|
||||
|
|
@ -46,6 +46,16 @@ stdenv.mkDerivation rec {
|
|||
make check
|
||||
'';
|
||||
|
||||
# Use wrapped gnome-keyring-daemon with cap_ipc_lock=ep
|
||||
postFixup = ''
|
||||
files=($out/etc/xdg/autostart/* $out/share/dbus-1/services/*)
|
||||
|
||||
for file in ''${files[*]}; do
|
||||
substituteInPlace $file \
|
||||
--replace "$out/bin/gnome-keyring-daemon" "/run/wrappers/bin/gnome-keyring-daemon"
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "gnome-keyring";
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
|
|||
src = ./fix-paths.patch;
|
||||
inherit tzdata mousetweaks;
|
||||
})
|
||||
./global-backlight-helper.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -94,6 +95,12 @@ stdenv.mkDerivation rec {
|
|||
"-Dudev_dir=${placeholder "out"}/lib/udev"
|
||||
];
|
||||
|
||||
# So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper
|
||||
postFixup = ''
|
||||
mkdir -p $out/bin/gnome-settings-daemon
|
||||
ln -s $out/libexec/gsd-backlight-helper $out/bin/gnome-settings-daemon/gsd-backlight-helper
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do
|
||||
chmod +x $f
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
|
||||
index d7d10fd2..5619d6ad 100644
|
||||
--- a/plugins/power/gsd-backlight.c
|
||||
+++ b/plugins/power/gsd-backlight.c
|
||||
@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task)
|
||||
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE,
|
||||
&error,
|
||||
"pkexec",
|
||||
- LIBEXECDIR "/gsd-backlight-helper",
|
||||
+ "/run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper",
|
||||
g_udev_device_get_sysfs_path (backlight->udev_device),
|
||||
data->value_str, NULL);
|
||||
} else {
|
||||
diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
|
||||
index f16300f8..79d6bd17 100644
|
||||
--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
|
||||
+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
|
||||
@@ -25,7 +25,7 @@
|
||||
<allow_inactive>no</allow_inactive>
|
||||
<allow_active>yes</allow_active>
|
||||
</defaults>
|
||||
- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate>
|
||||
+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper</annotate>
|
||||
</action>
|
||||
|
||||
</policyconfig>
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
stdenvNoCC.mkDerivation rec {
|
||||
name = "fasm-bin-${version}";
|
||||
|
||||
version = "1.73.10";
|
||||
version = "1.73.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://flatassembler.net/fasm-${version}.tgz";
|
||||
sha256 = "1lk8vlr0vg7h8lhiav99paa5a1mi0r2m8agxjmczhhavqhx44c32";
|
||||
sha256 = "1zhbs72qc8bw5158zh6mvzznfamcx5a1bsmbmq9ci0d7wb58sxmg";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
|
||||
|
||||
let
|
||||
version = "1.3.30";
|
||||
version = "1.3.31";
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
name = "kotlin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "1v5x64srafg7j3d31qhwhxv4hm2vg8vlbfncri3s5h3y6lcj4p1x";
|
||||
sha256 = "0sldhjxh2ghzwkabgziyiq4609iws0vninr8zxclzbqmcgajawqh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
callPackage ./generic.nix (rec {
|
||||
inherit Foundation libobjc;
|
||||
version = "5.16.0.220";
|
||||
sha256 = "1qwdmxssplfdb5rq86f1j8lskvr9dfk5c8hqz9ic09ml69r8c87l";
|
||||
enableParallelBuilding = false;
|
||||
version = "5.20.1.27";
|
||||
sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy";
|
||||
enableParallelBuilding = true;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -53,8 +53,20 @@ stdenv.mkDerivation ({
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs
|
||||
|
||||
IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true
|
||||
|
||||
# If the ipkg file defines an executable, install that
|
||||
executable=$(grep -Po '^executable = \K.*' ${ipkgName}.ipkg || true)
|
||||
# $executable intentionally not quoted because it must be quoted correctly
|
||||
# in the ipkg file already
|
||||
if [ ! -z "$executable" ] && [ -f $executable ]; then
|
||||
mkdir -p $out/bin
|
||||
mv $executable $out/bin/$executable
|
||||
fi
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ in
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "aravis";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AravisProject";
|
||||
repo = pname;
|
||||
rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "0v0hv1iyhp2azxij3ighp1b4rsw99zyqmkpdqnnxdmkcna031iga";
|
||||
sha256 = "0zlmw040iv0xx9qw7ygzbl96bli6ivll2fbziv19f4bdc0yhqjpw";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "lib" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wfqs77plb37gp586a0pclxjlpsjvq44991am8p2g5j46zfz6pdx";
|
||||
sha256 = "1z02ndb9jjn0p5bcc49pq0d8c0q2pq33dlszw77l76jkhrfx0921";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "cimg-${version}";
|
||||
version = "2.5.6";
|
||||
version = "2.5.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cimg.eu/files/CImg_${version}.zip";
|
||||
sha256 = "02n3xjjs68xszvyk2830i03clbqlngnic0cw1rk6xca7gsvad3ij";
|
||||
sha256 = "155mmxrd2gm81v4ayff43xhi341ivqfpx2n6x9imldkr35hchzvm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ let
|
|||
pname = "cogl";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "1.22.2";
|
||||
version = "1.22.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr";
|
||||
sha256 = "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "folly-${version}";
|
||||
version = "2019.03.18.00";
|
||||
version = "2019.04.22.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "folly";
|
||||
rev = "v${version}";
|
||||
sha256 = "0g7c2lq4prcw9dd5r4q62l8kqm8frczrfq8m4mgs22np60yvmb6d";
|
||||
sha256 = "08aniprv2a96d3k36k668maq9nysxh0cm58i0hvy71cqcmc97h7p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "itk-4.13.1";
|
||||
name = "itk-4.13.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/itk/InsightToolkit-4.13.1.tar.xz;
|
||||
sha256 = "0p4cspgbnjsnkjz8nfg092yaxz8qkqi2nkxjdv421d0zrmi0i2al";
|
||||
url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz;
|
||||
sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ assert withFonts -> freetype != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libbluray-${version}";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2";
|
||||
sha256 = "10zyqgccgl8kl9d9ljml86sm9s9l2424y55vilb3lifkdb9019p6";
|
||||
sha256 = "0f138xlldzci8wic89i9vpka3mdsn8r78khpnk3wijlbgjhphr0h";
|
||||
};
|
||||
|
||||
patches = optional withJava ./BDJ-JARFILE-path.patch;
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgit2-glib";
|
||||
version = "0.27.8";
|
||||
version = "0.28.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0d8rwgf69424ijy6fjbk3m863y9ml5bq7mshlqw7xqk9zngdd6f1";
|
||||
sha256 = "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libiconv-${version}";
|
||||
version = "1.15";
|
||||
version = "1.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libiconv/${name}.tar.gz";
|
||||
sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc";
|
||||
sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6";
|
||||
};
|
||||
|
||||
setupHooks = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "18.12";
|
||||
version = "19.04";
|
||||
name = "libmediainfo-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
|
||||
sha256 = "0kvfhcij32jfkggbhqzy7bfiwrly5j51d5gdz5lrfdcjq113svwp";
|
||||
sha256 = "1yr2vl2z9z1kllr5ygi39r1ryw695cic8yj34yragkk33l1z6xc2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="libmwaw";
|
||||
version="0.3.14";
|
||||
version="0.3.15";
|
||||
name="${baseName}-${version}";
|
||||
hash="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c";
|
||||
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.14/libmwaw-0.3.14.tar.xz";
|
||||
sha256="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c";
|
||||
hash="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04";
|
||||
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.15/libmwaw-0.3.15.tar.xz";
|
||||
sha256="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -1,22 +1,41 @@
|
|||
{ stdenv, fetchurl, pkgconfig, autoreconfHook
|
||||
, glib, gdk_pixbuf, gobject-introspection }:
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, fetchpatch
|
||||
, glib, gdk_pixbuf, gobject-introspection, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
ver_maj = "0.7";
|
||||
ver_min = "7";
|
||||
name = "libnotify-${ver_maj}.${ver_min}";
|
||||
pname = "libnotify";
|
||||
version = "0.7.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1371csx0n92g60b5dmai4mmzdnx8081mc3kcgc6a0xipcq5rw839";
|
||||
};
|
||||
|
||||
# disable tests as we don't need to depend on gtk+(2/3)
|
||||
configureFlags = [ "--disable-tests" ];
|
||||
patches = [
|
||||
# Fix darwin build
|
||||
# https://gitlab.gnome.org/GNOME/libnotify/merge_requests/9
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/libnotify/commit/55eb69247fe2b479ea43311503042fc03bf4e67d.patch";
|
||||
sha256 = "1hlb5b7c5axiyir1i5j2pi94bm2gyr1ybkp6yaqy7yk6iiqlvv50";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook gobject-introspection ];
|
||||
mesonFlags = [
|
||||
# disable tests as we don't need to depend on gtk+(2/3)
|
||||
"-Dtests=false"
|
||||
"-Ddocbook_docs=disabled"
|
||||
"-Dgtk_doc=false"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
|
||||
buildInputs = [ glib gdk_pixbuf ];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
versionPolicy = "none";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://developer.gnome.org/notification-spec/;
|
||||
description = "A library that sends desktop notifications to a notification daemon";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libpst-0.6.71";
|
||||
name = "libpst-0.6.72";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz";
|
||||
sha256 = "130nksrwgi3ih32si5alvxwzd5kmlg8yi7p03w0h7w9r3b90i4pv";
|
||||
sha256 = "01ymym0218805g7bqhr7x2rlhzsbsbidi3nr0z2r2w07xf8xh6ca";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqalculate";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${version}";
|
||||
sha256 = "0i21c92r94mp03673cvngvqph268ir4j89d5s9qzxgq2zjw5pc8q";
|
||||
sha256 = "1r0l0aik3fiyskpdgw93gxqgw109g6pa27y983rirhl6rricp3wf";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "librealsense-${version}";
|
||||
version = "2.20.0";
|
||||
version = "2.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IntelRealSense";
|
||||
repo = "librealsense";
|
||||
rev = "v${version}";
|
||||
sha256 = "131qpmp2h43snx0fx7jc810mil0zy52gy2dci367ln38a2pwvyhg";
|
||||
sha256 = "0fg4js390gj9lhyh9hmr7k3lhg5q1r47skyvziv9dmbj9dqm1ll7";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libxmlb-${version}";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "devdoc" ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "hughsie";
|
||||
repo = "libxmlb";
|
||||
rev = version;
|
||||
sha256 = "17q1kjkff0frvm26agbqi0hdhg5d4icwn36qzf3y53wrdv5s148x";
|
||||
sha256 = "0nry2a4vskfklykd20smp4maqpzibc65rzyv4i71nrc55dyjpy7x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ];
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
|
||||
stdenv.mkDerivation rec {
|
||||
name = "live555-${version}";
|
||||
version = "2019.03.06";
|
||||
version = "2019.04.24";
|
||||
|
||||
src = fetchurl { # the upstream doesn't provide a stable URL
|
||||
urls = [
|
||||
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
|
||||
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
|
||||
];
|
||||
sha256 = "1gasdl95yjabv811knkmy5laj21a54z1jdfq36jdj984k1nw5l0b";
|
||||
sha256 = "0wnxc4g04afsash1jn240zgdzh6lxa6rsaghahk34zlllb74dgdv";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ipopt-${version}";
|
||||
version = "3.12.12";
|
||||
version = "3.12.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
|
||||
sha256 = "1kh680ilw1c304hdh9i267gqhp0xg58jy8dk4svjvjc86sp1i23q";
|
||||
sha256 = "0kzf05aypx8q5mr3sciclk926ans0yi2d2chjdxxgpi3sza609dx";
|
||||
};
|
||||
|
||||
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
export LC_ALL=en_US.UTF-8
|
||||
${python.interpreter} -m pyfakefs.tests.all_tests
|
||||
${python.interpreter} -m pyfakefs.tests.all_tests_without_extra_packages
|
||||
${python.interpreter} -m pytest pyfakefs/tests/pytest/pytest_plugin_test.py
|
||||
${python.interpreter} -m pytest pyfakefs/pytest_tests/pytest_plugin_test.py
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -415,6 +415,7 @@ in
|
|||
sup = attrs: {
|
||||
dontBuild = false;
|
||||
# prevent sup from trying to dynamically install `xapian-ruby`.
|
||||
nativeBuildInputs = [ rake ];
|
||||
postPatch = ''
|
||||
cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb
|
||||
|
||||
|
|
@ -484,7 +485,7 @@ in
|
|||
xapian-ruby = attrs: {
|
||||
# use the system xapian
|
||||
dontBuild = false;
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ rake pkgconfig ];
|
||||
buildInputs = [ xapian_1_2_22 zlib ];
|
||||
postPatch = ''
|
||||
cp ${./xapian-Rakefile} Rakefile
|
||||
|
|
|
|||
|
|
@ -4,35 +4,30 @@ require 'rbconfig'
|
|||
|
||||
c = RbConfig::CONFIG
|
||||
|
||||
def system!(cmd)
|
||||
puts cmd
|
||||
system(cmd) or raise
|
||||
end
|
||||
|
||||
source_dir = 'xapian_source'
|
||||
bindings = Dir["#{source_dir}/xapian-bindings-*"].first
|
||||
bindings = File.basename(bindings, ".tar.xz")
|
||||
|
||||
task :default do
|
||||
system! "tar -xJf #{source_dir}/#{bindings}.tar.xz"
|
||||
sh "tar -xJf #{source_dir}/#{bindings}.tar.xz"
|
||||
|
||||
prefix = Dir.pwd
|
||||
ENV['LDFLAGS'] = "-L#{prefix}/lib"
|
||||
|
||||
system! "mkdir -p lib"
|
||||
sh "mkdir -p lib"
|
||||
|
||||
Dir.chdir bindings do
|
||||
ENV['RUBY'] ||= "#{c['bindir']}/#{c['RUBY_INSTALL_NAME']}"
|
||||
system! "./configure --prefix=#{prefix} --exec-prefix=#{prefix} --with-ruby"
|
||||
system! "make clean all"
|
||||
sh "./configure --prefix=#{prefix} --exec-prefix=#{prefix} --with-ruby"
|
||||
sh "make clean all"
|
||||
end
|
||||
|
||||
system! "cp -r #{bindings}/ruby/.libs/_xapian.* lib"
|
||||
system! "cp #{bindings}/ruby/xapian.rb lib"
|
||||
sh "cp -r #{bindings}/ruby/.libs/_xapian.* lib"
|
||||
sh "cp #{bindings}/ruby/xapian.rb lib"
|
||||
|
||||
system! "rm lib/*.la"
|
||||
system! "rm lib/*.lai"
|
||||
sh "rm lib/*.la"
|
||||
sh "rm lib/*.lai"
|
||||
|
||||
system! "rm -R #{bindings}"
|
||||
system! "rm -R #{source_dir}"
|
||||
sh "rm -R #{bindings}"
|
||||
sh "rm -R #{source_dir}"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.19";
|
||||
version = "8.20";
|
||||
name = "checkstyle-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "107x4ij99igq54f0mdqvv8adl2rh694b8ylf3jz090raqa0d2nyk";
|
||||
sha256 = "1vsszdmdpyjdwlc9qqw4m8s6rw3pkdrczrmlmydwqmzvzr559nyp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "galen";
|
||||
version = "2.3.7";
|
||||
version = "2.4.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit jre8;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip";
|
||||
sha256 = "045y1s4n8jd52jnk9kwd0k4x3yscvcfsf2rxzn0xngvn9nkw2g65";
|
||||
sha256 = "13dq8cf0yy24vym6z7p8hb0mybgpcl4j5crsaq8a6pjfxz6d17mq";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "godot-${version}";
|
||||
version = "3.1";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godotengine";
|
||||
repo = "godot";
|
||||
rev = "${version}-stable";
|
||||
sha256 = "1z37znqzbn0x8s04pb9dxzni9jzl8m59nfrr14vypww42f9l5i7i";
|
||||
sha256 = "0lplkwgshh0x7r1daai9gflzwjnp3yfx4724h1myvidaz234v2wh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ktlint-${version}";
|
||||
version = "0.31.0";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint";
|
||||
sha256 = "0bqpflvnh423w54162r0d6l503lql1bwqykxw18s2fx1n1gb3n9a";
|
||||
sha256 = "0ha4n2gsfvcycwammywqr7xg5ydlgpflmlm380v767178p5r5llm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gede-${version}";
|
||||
version = "2.12.3";
|
||||
version = "2.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
|
||||
sha256 = "041wvby19dlcbb7x3yn2mbcfkrn0pkyjpgm40ngsks63kqzmkpdp";
|
||||
sha256 = "00qgp45hgcnmv8qj0vicqmiwa82rzyadcqy48xfxjd4xgf0qy5bk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake makeWrapper python ];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "11.14.0";
|
||||
sha256 = "1rvdyvlvh8ddm9y2razshly5kb87kw0js287i0a5dzb5ay41vxlx";
|
||||
version = "11.15.0";
|
||||
sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "commandergenius-${version}";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Dringgstein";
|
||||
repo = "Commander-Genius";
|
||||
rev = "v${version}";
|
||||
sha256 = "1a8as56ycbq8csnssd5wqv2jand5c9yskld6prh3dn9gy96jbvgj";
|
||||
sha256 = "04nb23wwvc3yywz3cr6gvn02fa7psfs22ssg4wk12s08z1azvz3h";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lgogdownloader-${version}";
|
||||
version = "3.4";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sude-";
|
||||
repo = "lgogdownloader";
|
||||
rev = "v${version}";
|
||||
sha256 = "155vnz4w2v5d3yihwzq8yi406g19kc7banzlarhlcp3j11riwd24";
|
||||
sha256 = "0a3rrkgqwdqxx3ghzw182jx88gzzw6ldp3jasmgnr4l7gpxkmwws";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig help2man ];
|
||||
|
|
|
|||
|
|
@ -36,24 +36,18 @@ let
|
|||
});
|
||||
|
||||
in {
|
||||
minecraft-server_1_14 = common {
|
||||
version = "1.14";
|
||||
url = "https://launcher.mojang.com/v1/objects/f1a0073671057f01aa843443fef34330281333ce/server.jar";
|
||||
sha256 = "671e3d334dd601c520bf1aeb96e49038145172bef16bc6c418e969fd8bf8ff6c";
|
||||
};
|
||||
|
||||
minecraft-server_1_13_2 = common {
|
||||
version = "1.13.2";
|
||||
url = "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar";
|
||||
sha256 = "13h8dxrrgqa1g6sd7aaw26779hcsqsyjm7xm0sknifn54lnamlzz";
|
||||
};
|
||||
|
||||
minecraft-server_1_13_1 = common {
|
||||
version = "1.13.1";
|
||||
url = "https://launcher.mojang.com/mc/game/1.13.1/server/fe123682e9cb30031eae351764f653500b7396c9/server.jar";
|
||||
sha256 = "1lak29b7dm0w1cmzjn9gyix6qkszwg8xgb20hci2ki2ifrz099if";
|
||||
};
|
||||
|
||||
minecraft-server_1_13_0 = common {
|
||||
version = "1.13.0";
|
||||
url = "https://launcher.mojang.com/mc/game/1.13/server/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar";
|
||||
sha256 = "1fahqnylxzbvc0fdsqk0x15z40mcc5b7shrckab1qcsdj0kkjvz7";
|
||||
};
|
||||
|
||||
minecraft-server_1_12_2 = common {
|
||||
version = "1.12.2";
|
||||
url = "https://s3.amazonaws.com/Minecraft.Download/versions/1.12.2/minecraft_server.1.12.2.jar";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig,
|
||||
python3, boost, fuse, libtorrentRasterbar, curl }:
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
|
||||
, python3, boost, fuse, libtorrentRasterbar, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "btfs-${version}";
|
||||
version = "2.18";
|
||||
pname = "btfs";
|
||||
version = "2.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johang";
|
||||
repo = "btfs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1cn21bxx43iqvac6scmwhkw0bql092sl48r6qfidbmhbw30xl5yf";
|
||||
sha256 = "1b58zqha2hpnk4ysp9870wd9pkyy6l106ghp0z0x655q70npj0wn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [
|
||||
boost autoreconfHook
|
||||
fuse libtorrentRasterbar curl
|
||||
boost fuse libtorrentRasterbar curl
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jetty-${version}";
|
||||
version = "9.4.14.v20181114";
|
||||
version = "9.4.16.v20190411";
|
||||
src = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
|
||||
name = "jetty-distribution-${version}.tar.gz";
|
||||
sha256 = "1i83jfd17d9sl9pjc8r9i8mx3nr9x0m5s50fd4l5ppzn4drvssn6";
|
||||
sha256 = "0vkcm68cp7z45pgfg5maxcxfjwy4xj30f2d0c7cfnw9d38wf5lpq";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec {
|
||||
name = "icingaweb2-${version}";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Icinga";
|
||||
repo = "icingaweb2";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gf28nm94bq6r7i8yds5y9s59559i2zvj0swzb28zll6xbyprib0";
|
||||
sha256 = "0xcsf45m85d4ww5y2d5i73rjbp3hmc8lljc67lz9fl6f90y9gb22";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jackett-${version}";
|
||||
version = "0.11.170";
|
||||
version = "0.11.256";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
|
||||
sha256 = "1qnlbndls62mvpllg8177l7mihldz5nwig63gfk7in2r0b0477l3";
|
||||
sha256 = "15rc49ql86anxylpfgvgbb1bv7faxy3g1qaskh7sqyncs4q2jc1h";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lidarr-${version}";
|
||||
version = "0.6.0.815";
|
||||
version = "0.6.1.830";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz";
|
||||
sha256 = "08aa286y71pzn8wxjiag1bn5303i05jznqwmgrbqfb4jwz94pyjs";
|
||||
sha256 = "1pchz3dq8nfx7kp3dalkpi5rpwzkhn3d0a1djdja6yz5xgaiprqb";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,24 +1,23 @@
|
|||
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "oauth2_proxy-${version}";
|
||||
version = "20180325-${stdenv.lib.strings.substring 0 7 rev}";
|
||||
rev = "a94b0a8b25e553f7333f7b84aeb89d9d18ec259b";
|
||||
pname = "oauth2_proxy";
|
||||
version = "3.2.0";
|
||||
|
||||
goPackagePath = "github.com/bitly/oauth2_proxy";
|
||||
goPackagePath = "github.com/pusher/${pname}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
repo = "oauth2_proxy";
|
||||
owner = "bitly";
|
||||
sha256 = "07m258s9fxjsgixggw0d1zicd7l6l2rkm5mh3zdjdaj20sqcj217";
|
||||
repo = pname;
|
||||
owner = "pusher";
|
||||
sha256 = "0k73ggyh12g2vzjq91i9d3bxbqfvh5k6njzza1lvkzasgp07wisg";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A reverse proxy that provides authentication with Google, Github or other provider";
|
||||
homepage = https://github.com/bitly/oauth2_proxy/;
|
||||
homepage = https://github.com/pusher/oauth2_proxy/;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.yorickvp ];
|
||||
};
|
||||
|
|
|
|||
132
pkgs/servers/oauth2_proxy/deps.nix
generated
132
pkgs/servers/oauth2_proxy/deps.nix
generated
|
|
@ -1,12 +1,12 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "cloud.google.com/go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://code.googlesource.com/gocloud";
|
||||
rev = "d27f27d9b3cf75c9901d9981f9af50bbfd9002da";
|
||||
sha256 = "18vdhkymm4cqh5fjyz0ia0bc2mpmarjk6w6zh9ydm2d4nkj36cm5";
|
||||
rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613";
|
||||
sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -14,8 +14,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/BurntSushi/toml";
|
||||
rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
|
||||
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
|
||||
rev = "b26d9c308763d68093482582cea63d69be07a0f0";
|
||||
sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/bitly/go-simplejson";
|
||||
rev = "0c965951289cce37dec52ad1f34200fefc816777";
|
||||
sha256 = "0ys37wshd430dizzbg39x5mw55daih2q4qj5l9gr3qbmq9qdn0f3";
|
||||
rev = "aabad6e819789e569bd6aabf444c935aa9ba1e44";
|
||||
sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -32,8 +32,35 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/coreos/go-oidc";
|
||||
rev = "065b426bd41667456c1a924468f507673629c46b";
|
||||
sha256 = "10xhrh70rccgydi708dc9xl4ivmjnzhh1skd1ij6xl1i3x8lk3g6";
|
||||
rev = "77e7f2010a464ade7338597afe650dfcffbe2ca8";
|
||||
sha256 = "0mh8fa7al9gfzx4k7rd623bpy14s06s96iz6lbf6psi5q2bnbs2r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/davecgh/go-spew";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/davecgh/go-spew";
|
||||
rev = "346938d642f2ec3594ed81d874461961cd0faa76";
|
||||
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/dgrijalva/jwt-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/dgrijalva/jwt-go";
|
||||
rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
|
||||
sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845";
|
||||
sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -41,8 +68,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mbland/hmacauth";
|
||||
rev = "44256dfd4bfa7594cfa73587a464ca890e85971a";
|
||||
sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1";
|
||||
rev = "107c17adcc5eccc9935cd67d9bc2feaf5255d2cb";
|
||||
sha256 = "1zd9r8znhkxyl997lhjk8nrlxlfv5s1hn7ql87wrcyvlsszx3mzh";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -50,8 +77,17 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mreiferson/go-options";
|
||||
rev = "77551d20752b54535462404ad9d877ebdb26e53d";
|
||||
sha256 = "02c18zrx038gbas58l90xzsz9m5q3gpjprdcwmnvxsn0zvld0vpj";
|
||||
rev = "20ba7d382d05facb01e02eb777af0c5f229c5c95";
|
||||
sha256 = "1vdz3wqkj885a0jkggaygl4k6k8b94fpspywr26snm4xnb8vgxsf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pmezard/go-difflib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pmezard/go-difflib";
|
||||
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
|
||||
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -59,8 +95,26 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pquerna/cachecontrol";
|
||||
rev = "525d0eb5f91d30e3b1548de401b7ef9ea6898520";
|
||||
sha256 = "13r6qz9pghy9fapps5h9mhblggnjq2nfxysvf2jp4scanc5vw2y3";
|
||||
rev = "0dec1b30a0215bb68605dfc568e8855066c9202d";
|
||||
sha256 = "14yyfhrv60rvb983rqm7s916nwvn9kcmbvnrcna2md0s3mkzs3yh";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/stretchr/testify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/testify";
|
||||
rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
|
||||
sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/yhat/wsutil";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/yhat/wsutil";
|
||||
rev = "1d66fa95c997864ba4d8479f56609620fe542928";
|
||||
sha256 = "1agh4ss6y1laps8pg4mdl844ivmw2wrb7rnpfyag4gai4693i7bv";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -68,8 +122,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "88942b9c40a4c9d203b82b3731787b672d6e809b";
|
||||
sha256 = "0jw1faq8krcxwf1fv3w75apk1ncnykwg8y5ahs5rasjmspvkv8cw";
|
||||
rev = "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94";
|
||||
sha256 = "1mhmr6ljzl3iafsz4qy8vval7rmr828wh59dlqqqjqx6sqmcs1dv";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -77,8 +131,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "6078986fec03a1dcc236c34816c71b0e05018fda";
|
||||
sha256 = "0qbl17mzpq7anwyzy6hdvxqk7f6q2xlm6f9dknkwlszfd4id2fwb";
|
||||
rev = "9dfe39835686865bff950a07b394c12a98ddc811";
|
||||
sha256 = "0z8mnl4mi88syafrgqys2ak2gg3yrbna25hpz88y3anl8x4jhg1a";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -86,17 +140,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/oauth2";
|
||||
rev = "fdc9e635145ae97e6c2cb777c48305600cf515cb";
|
||||
sha256 = "0pznj7pb2rjar005dvppimdynarm8smj6vnqz9wvd9fxyn0q0yww";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "13d03a9a82fba647c21a0ef8fba44a795d0f0835";
|
||||
sha256 = "1lmyd4mk7lbgnxyvr6ndfdfafazp9a4cc6c0a2q2j4n53g2vwbgk";
|
||||
rev = "9ff8ebcc8e241d46f52ecc5bff0e5a2f2dbef402";
|
||||
sha256 = "035v5w1nad6r1l22cj6f73zzr6qi4jgq71yjywf2c6rvsa5147r2";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -104,26 +149,35 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://code.googlesource.com/google-api-go-client";
|
||||
rev = "e4126357c891acdef6dcd7805daa4c6533be6544";
|
||||
sha256 = "19c874pr7vhhiyw7zn6v625g8i70gqzi3rr645kai6pnd1w7s27n";
|
||||
rev = "8791354e7ab150705ede13637a18c1fcc16b62e8";
|
||||
sha256 = "0ps7y4m9787wvkqwrwqyb4nmmibhrihmg7xqh7sba2cyj397wngm";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/fsnotify.v1";
|
||||
goPackagePath = "google.golang.org/appengine";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/fsnotify/fsnotify.v1";
|
||||
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
|
||||
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
|
||||
url = "https://github.com/golang/appengine";
|
||||
rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a";
|
||||
sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/fsnotify/fsnotify.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fsnotify/fsnotify";
|
||||
rev = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6";
|
||||
sha256 = "0470dznkcbabncskgr8hfilpj5w24ygg455pyggbfbssmfv1m9gg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/square/go-jose.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/square/go-jose.v2";
|
||||
rev = "552e98edab5d620205ff1a8960bf52a5a10aad03";
|
||||
sha256 = "03w6rgxkvdv3vcfr23s6wbck431w7dwnw0jy7qnyl0qihxzn40rv";
|
||||
url = "https://github.com/square/go-jose";
|
||||
rev = "f8f38de21b4dcd69d0413faf231983f5fd6634b1";
|
||||
sha256 = "1bjrs3xq3m2ckfds0l4wqf81311ymm9agipmkllbvkadac156dsa";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -13,13 +13,13 @@ let
|
|||
in
|
||||
buildGoPackage rec {
|
||||
name = "cockroach-${version}";
|
||||
version = "2.1.5";
|
||||
version = "2.1.6";
|
||||
|
||||
goPackagePath = "github.com/cockroachdb/cockroach";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
|
||||
sha256 = "0bdbkz917175vp28kc513996ik0m61hfbvnqnv0alxv0mfx8djzn";
|
||||
sha256 = "1sry2qvcar7yn80y2azh0lmz4yp12r27hq3w8nyqz2gw36k9k8q4";
|
||||
};
|
||||
|
||||
inherit nativeBuildInputs buildInputs;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "acme.sh-${version}";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Neilpang";
|
||||
repo = "acme.sh";
|
||||
rev = version;
|
||||
sha256 = "1h22bmx065v0lhwkr4zykybfl6ppjr2wibgwy2wnihy30g28zq7v";
|
||||
sha256 = "1xpci41494jrwf2qfnv83zwd1jd99ddpy1ardrshj9n4jdnzd19w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "btrbk-${version}";
|
||||
version = "0.27.2";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz";
|
||||
sha256 = "1xxpwlvijzgvn17sag9gx3vbmk82plmyp19wah714z3j07djczh2";
|
||||
sha256 = "1bqgcbkdd5s3l3ba1ifa9l523r8cr5y3arjdy9f6rmm840kn7xzf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ asciidoc makeWrapper ];
|
||||
|
|
|
|||
34
pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
Normal file
34
pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ cmake, fetchFromGitHub, opencv3, stdenv, opencl-headers
|
||||
, cudaSupport ? false, cudatoolkit ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waifu2x-converter-cpp";
|
||||
version = "5.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeadSix27";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0r7xcjqbyaa20gsgmjj7645640g3nb2bn1pc1nlfplwlzjxmz213";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
# https://github.com/DeadSix27/waifu2x-converter-cpp/issues/123
|
||||
sed -i 's:{"PNG", false},:{"PNG", true},:' src/main.cpp
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
opencv3 opencl-headers
|
||||
] ++ stdenv.lib.optional cudaSupport cudatoolkit;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = {
|
||||
description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV";
|
||||
homepage = https://github.com/DeadSix27/waifu2x-converter-cpp;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.xzfc ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,12 +7,12 @@
|
|||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "calamares";
|
||||
version = "3.2.4";
|
||||
version = "3.2.7";
|
||||
|
||||
# release including submodule
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "0wsr1awmk5dnx2cqpp5sb6xhsq7b1jqwbsi1n39db97iyshah6fb";
|
||||
sha256 = "0dnxas0nca10vbqgspy27gn81izrpl5nqy66zxbkh4pfxmi7zqdk";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fontforge";
|
||||
version = "20190317";
|
||||
version = "20190413";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1ddqbpc32cgbccdnv0lfw0qhj59hcqzb7616ph5lkvm91pnas4dp";
|
||||
sha256 = "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7";
|
||||
};
|
||||
|
||||
patches = [ ./fontforge-20140813-use-system-uthash.patch ];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fwup-${version}";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fhunleth";
|
||||
repo = "fwup";
|
||||
rev = "v${version}";
|
||||
sha256 = "1npxps5kg5z9f52k3p62sxf4cvdrdddrggfpip0n0whm1dx9rjrx";
|
||||
sha256 = "058llxr8hbdjl721g76icm0gr50bglcgazwrbp3dxyd9jaa0bzc7";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.16";
|
||||
version = "4.18";
|
||||
name = "hebcal-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hebcal";
|
||||
repo = "hebcal";
|
||||
rev = "v${version}";
|
||||
sha256 = "081h3dan0v14camv6j3swl9y31yzfwjfkp2h8xz5qmrh0scv8azr";
|
||||
sha256 = "13b3gbfl043s6vycf5kdy2lkchy3kg690vy0dpmy3si6x05nl10w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ buildPythonPackage rec {
|
|||
# The websites youtube-dl deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2019.04.24";
|
||||
version = "2019.04.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1kzz3y2q6798mwn20i69imf48kb04gx3rznfl06hb8qv5zxm9gqz";
|
||||
sha256 = "1s43adnky8ayhjwmgmiqy6rmmygd4c23v36jhy2lzr2jpn8l53z1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@ assert usePcre -> pcre != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haproxy";
|
||||
version = "1.9.6";
|
||||
version = "1.9.7";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
|
||||
sha256 = "1vwvy6kgjv767c5bdv415c9ic6vbx237hj20axl0zm0l55gc6dq8";
|
||||
sha256 = "0cln17gdv81xb24hkylw7addj1xxqnldhw82vnyc0gnc51klcnay";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib ]
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "facter-${version}";
|
||||
version = "3.13.1";
|
||||
version = "3.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1cj56s3gghkja4zrcyzhrwq5ac0r7zjfgj7jzp0i56vdv8a1mihr";
|
||||
sha256 = "1yaj1qlyzsaffzpm4zmzm53mc6bhpzka8wc3dfk909nzykxg34zf";
|
||||
rev = version;
|
||||
repo = "facter";
|
||||
owner = "puppetlabs";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ansifilter-${version}";
|
||||
version = "2.13";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2";
|
||||
sha256 = "1h0j30lg1lcr8p5dlhrgpm76bvlnhxn2cr3jqjnvnb2icgbyc8j0";
|
||||
sha256 = "1bwp8zmxykfxr3mz1fgvnwqbyix4qpjlha3y479jdchq4y8y7vp2";
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3432,6 +3432,8 @@ in
|
|||
|
||||
halide = callPackage ../development/compilers/halide { };
|
||||
|
||||
ham = pkgs.perlPackages.ham;
|
||||
|
||||
hardinfo = callPackage ../tools/system/hardinfo { };
|
||||
|
||||
hdapsd = callPackage ../os-specific/linux/hdapsd { };
|
||||
|
|
@ -6355,6 +6357,8 @@ in
|
|||
|
||||
vtun = callPackage ../tools/networking/vtun { };
|
||||
|
||||
waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { };
|
||||
|
||||
wakatime = pythonPackages.callPackage ../tools/misc/wakatime { };
|
||||
|
||||
weather = callPackage ../applications/misc/weather { };
|
||||
|
|
@ -15993,6 +15997,8 @@ in
|
|||
|
||||
cooper-hewitt = callPackage ../data/fonts/cooper-hewitt { };
|
||||
|
||||
d2coding = callPackage ../data/fonts/d2coding { };
|
||||
|
||||
dosis = callPackage ../data/fonts/dosis { };
|
||||
|
||||
dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
|
||||
|
|
@ -16213,6 +16219,8 @@ in
|
|||
|
||||
nafees = callPackage ../data/fonts/nafees { };
|
||||
|
||||
nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { };
|
||||
|
||||
nordic = callPackage ../data/themes/nordic { };
|
||||
|
||||
nordic-polar = callPackage ../data/themes/nordic-polar { };
|
||||
|
|
@ -19011,7 +19019,9 @@ in
|
|||
speedread = callPackage ../applications/misc/speedread { };
|
||||
|
||||
sup = callPackage ../applications/networking/mailreaders/sup {
|
||||
ruby = ruby_2_3.override { cursesSupport = true; };
|
||||
bundlerApp = bundlerApp.override{
|
||||
ruby = ruby.override { cursesSupport = true; };
|
||||
};
|
||||
};
|
||||
|
||||
synapse = callPackage ../applications/misc/synapse { };
|
||||
|
|
@ -21320,12 +21330,11 @@ in
|
|||
|
||||
minecraft = callPackage ../games/minecraft { };
|
||||
|
||||
minecraft-server = minecraft-server_1_13_2;
|
||||
minecraft-server = minecraft-server_1_14;
|
||||
|
||||
inherit (callPackages ../games/minecraft-server { })
|
||||
minecraft-server_1_14
|
||||
minecraft-server_1_13_2
|
||||
minecraft-server_1_13_1
|
||||
minecraft-server_1_13_0
|
||||
minecraft-server_1_12_2;
|
||||
|
||||
moon-buggy = callPackage ../games/moon-buggy {};
|
||||
|
|
@ -22521,6 +22530,7 @@ in
|
|||
wxGTK = wxGTK30;
|
||||
boost = boost160;
|
||||
};
|
||||
kicad-with-packages3d = kicad.overrideAttrs (old: { modules = old.modules ++ [ old.passthru.packages3d ]; });
|
||||
|
||||
kicad-unstable = python.pkgs.callPackage ../applications/science/electronics/kicad/unstable.nix {
|
||||
wxGTK = wxGTK30;
|
||||
|
|
|
|||
|
|
@ -6451,6 +6451,33 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
GitRepository = buildPerlPackage rec {
|
||||
name = "Git-Repository-1.323";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz";
|
||||
sha256 = "966575fcecc9f56ab8739ea451b3825e278bc9179d785a20a9ae52473f33683e";
|
||||
};
|
||||
buildInputs = [ TestRequiresGit ];
|
||||
propagatedBuildInputs = [ GitVersionCompare SystemCommand namespaceclean ];
|
||||
meta = {
|
||||
description = "Perl interface to Git repositories";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
GitVersionCompare = buildPerlPackage rec {
|
||||
name = "Git-Version-Compare-1.004";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz";
|
||||
sha256 = "63e8264ed351cb2371b47852a72366214164b5f3fad9dbd68309c7fc63d06491";
|
||||
};
|
||||
buildInputs = [ TestNoWarnings ];
|
||||
meta = {
|
||||
description = "Functions to compare Git versions";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
Glib = buildPerlPackage rec {
|
||||
name = "Glib-1.329";
|
||||
src = fetchurl {
|
||||
|
|
@ -6817,6 +6844,47 @@ let
|
|||
buildInputs = [ TestSimple13 ];
|
||||
};
|
||||
|
||||
ham = buildPerlPackage rec {
|
||||
name = "ham-unstable-${version}";
|
||||
version = "2019-01-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kernkonzept";
|
||||
repo = "ham";
|
||||
rev = "37c2e4e8b8bd779ba0f8c48a3c6ba34bad860b92";
|
||||
sha256 = "0h5r5256niskypl4g1j2573wqi0nn0mai5p04zsa06xrgyjqcy2j";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
propagatedBuildInputs = [ pkgs.openssh GitRepository URI XMLMini ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
touch Makefile.PL
|
||||
rm -f Makefile
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib $out/bin
|
||||
cp -r . $out/lib/ham
|
||||
|
||||
makeWrapper $out/lib/ham/ham $out/bin/ham --argv0 ham \
|
||||
--prefix PATH : ${pkgs.openssh}/bin
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A tool to manage big projects consisting of multiple loosely-coupled git repositories";
|
||||
homepage = https://github.com/kernkonzept/ham;
|
||||
license = "unknown"; # should be gpl2, but not quite sure
|
||||
maintainers = with stdenv.lib.maintainers; [ aw ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
};
|
||||
|
||||
HashFlatten = buildPerlPackage rec {
|
||||
name = "Hash-Flatten-1.19";
|
||||
src = fetchurl {
|
||||
|
|
@ -14481,6 +14549,19 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
SystemCommand = buildPerlPackage rec {
|
||||
name = "System-Command-1.119";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz";
|
||||
sha256 = "c8c9fb1e527c52463cab1476500efea70396a0b62bea625d2d6faea994dc46e7";
|
||||
};
|
||||
propagatedBuildInputs = [ IPCRun ];
|
||||
meta = {
|
||||
description = "Object for running system commands";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
SysVirt = buildPerlModule rec {
|
||||
version = "4.10.0";
|
||||
name = "Sys-Virt-${version}";
|
||||
|
|
@ -15691,6 +15772,19 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
TestRequiresGit = buildPerlPackage rec {
|
||||
name = "Test-Requires-Git-1.008";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz";
|
||||
sha256 = "70916210970d84d7491451159ab8b67e15251c8c0dae7c3df6c8d88542ea42a6";
|
||||
};
|
||||
propagatedBuildInputs = [ GitVersionCompare ];
|
||||
meta = {
|
||||
description = "Check your test requirements against the available version of Git";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
TestRequiresInternet = buildPerlPackage rec {
|
||||
name = "Test-RequiresInternet-0.05";
|
||||
src = fetchurl {
|
||||
|
|
@ -17587,6 +17681,17 @@ let
|
|||
propagatedBuildInputs = [ XMLLibXML ];
|
||||
};
|
||||
|
||||
XMLMini = buildPerlPackage rec {
|
||||
name = "XML-Mini-1.38";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/P/PD/PDEEGAN/${name}.tar.gz";
|
||||
sha256 = "af803d38036a3184e124a682e5466f1bc107f48a89ef35b0c7647e11a073fe2d";
|
||||
};
|
||||
meta = {
|
||||
license = "unknown";
|
||||
};
|
||||
};
|
||||
|
||||
XMLNamespaceSupport = buildPerlPackage {
|
||||
name = "XML-NamespaceSupport-1.12";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
Loading…
Reference in a new issue