Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk 2020-03-06 07:09:30 +01:00
commit 188c3a4d03
102 changed files with 1212 additions and 482 deletions

View file

@ -389,7 +389,7 @@ rec {
let
# Process mkMerge and mkIf properties.
defs' = concatMap (m:
map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value)
map (value: { inherit (m) file; inherit value; }) (builtins.addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value))
) defs;
# Process mkOverride properties.

View file

@ -154,7 +154,7 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
</listitem>
<listitem>
<para>
The <literal>99-main.network</literal> file was removed. Maching all
The <literal>99-main.network</literal> file was removed. Matching all
network interfaces caused many breakages, see
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/18962">#18962</link>
and <link xlink:href="https://github.com/NixOS/nixpkgs/pull/71106">#71106</link>.

View file

@ -18,7 +18,7 @@ state_dir=$HOME/amis/ec2-images
home_region=eu-west-1
bucket=nixos-amis
regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1
regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1 eu-north-1
us-east-1 us-east-2 us-west-1 us-west-2
ca-central-1
ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2

View file

@ -61,10 +61,7 @@ in
++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;
users.groups = singleton
{ name = "disnix";
gid = config.ids.gids.disnix;
};
users.groups.disnix.gid = config.ids.gids.disnix;
systemd.services = {
disnix = mkIf cfg.enableMultiUser {

View file

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "snd-20.0";
name = "snd-20.1";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
sha256 = "195j0mkxvkb0znwhc0pjp4r0r8j4i12i27nxbkq27wg9rck6likc";
sha256 = "0v7zhavkkbh1bagzy3l08kb235hhdqn28y0m4znkd3k31p4l4dz8";
};
nativeBuildInputs = [ pkgconfig ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Sound editor";
homepage = http://ccrma.stanford.edu/software/snd;
homepage = "http://ccrma.stanford.edu/software/snd";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [ ];

View file

@ -7,13 +7,13 @@ with stdenv.lib;
mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
version = "0.20.12";
version = "0.21.1";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
sha256 = "0ar3syrz7psf83bh24hn2y0mxjgn7cjqk2h8q4cgdp7mq55v8ynj";
sha256 = "1aswgmzqk3vhxhp5k0m0awk22lf5ayaqg2cmlqy12jvfmpka9lrj";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
@ -37,7 +37,7 @@ mkDerivation rec {
Bitcoin ABC is a fork of the Bitcoin Core software project.
'';
homepage = https://bitcoinabc.org/;
homepage = "https://bitcoinabc.org/";
maintainers = with maintainers; [ lassulus ];
license = licenses.mit;
broken = stdenv.isDarwin;

View file

@ -2,7 +2,7 @@
let
pname = "kdevelop-pg-qt";
version = "2.2.0";
version = "2.2.1";
in
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "01a4y98hf8zlrdf5l8f4izqh4n3j3xs93j8ny5a3f4z50nb6hxq7";
sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1";
};
nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
version = "4.3.0";
version = "4.4.3";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids";
sha256 = "03pq55mdgbaf6c2q57ww2990wr6qz8hk1r6xs1irqy8990m4afvk";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; [
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://avocode.com/;
homepage = "https://avocode.com/";
description = "The bridge between designers and developers";
license = licenses.unfree;
platforms = platforms.linux;

View file

@ -10,17 +10,17 @@ let
udevRules = callPackage ./udev_rules_type1.nix {};
in stdenv.mkDerivation rec {
name = "brscan4-0.4.4-4";
name = "brscan4-0.4.8-1";
src =
if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb";
sha256 = "13mhjbzf9nvpdzrc2s98684r7likg76zxs1wlz2h8w59fsqgx4k2";
sha256 = "15hrf1gpm36lniqi6yf47dvdqjinm644xb752c6rcv8n06wb79ag";
}
else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
sha256 = "0pyprjl0capg403yp6pp07gd6msx9kn7bzjcdswdbn28fyxrk5l4";
}
else throw "${name} is not supported on ${stdenv.hostPlatform.system} (only i686-linux and x86_64 linux are supported)";

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "gallery_dl";
version = "1.12.3";
version = "1.13.1";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "06q6vmbliy935zlf4bbnfgiqyrx9vskz3fsks4jpxi47xs80rqkz";
sha256 = "0a5k7gcs3vn6x1f2qg3ajpqsl39pmw2hsj2srd5y2l1xw7mkkqj6";
};
doCheck = false;
@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
meta = {
description = "Command-line program to download image-galleries and -collections from several image hosting sites";
homepage = https://github.com/mikf/gallery-dl;
homepage = "https://github.com/mikf/gallery-dl";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ dawidsowa ];
};

View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "heimer";
version = "1.15.0";
version = "1.15.1";
src = fetchFromGitHub {
owner = "juzzlin";
repo = pname;
rev = version;
sha256 = "1qh8nr6yvxiy8pxl5pkhzlfr7hanxxc8hd8h00gsdxa0vgmqz11q";
sha256 = "13a9yfq7m8jhirb31i0mmigqb135r585zwqddknl090d88164fic";
};
nativeBuildInputs = [ cmake ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jgmenu";
version = "4.0.2";
version = "4.1.0";
src = fetchFromGitHub {
owner = "johanmalm";
repo = pname;
rev = "v${version}";
sha256 = "086p91l1igx5mv2i6fwbgx5p72war9aavc7v3m7sd0c0xvb334br";
sha256 = "1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk";
};
nativeBuildInputs = [
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = https://github.com/johanmalm/jgmenu;
homepage = "https://github.com/johanmalm/jgmenu";
description = "Small X11 menu intended to be used with openbox and tint2";
license = licenses.gpl2;
platforms = platforms.linux;

View file

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "pueue";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "Nukesor";
repo = pname;
rev = "v${version}";
sha256 = "03aj4vw8kvwqk1i1a4kah5b574ahs930ij7xmqsvdy7f8c2g6pbq";
sha256 = "1qp9h1xlfxwswcqi1qn2hfybxl547z13xjbvfgsx1nc8yj51bi3c";
};
nativeBuildInputs = [ installShellFiles ];
cargoSha256 = "08zqhj3b0v4fxj8vi323zrxg4xvbp9gndm2khzs6daacglbwbvhk";
cargoSha256 = "00va292bjdp42bkqdkjqajmzc2nshhqa1fj0yfwdf3rrx4nhssjd";
postInstall = ''
installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
version = "5.5.3";
version = "5.7.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
sha256 = "1an68ghs65dvxs8lvcflv7wmf431lqw417np76895w10w436gh7x";
sha256 = "14mqfjwff7mj3xckz4wkxlmqm6a0ci1bz0zj1h045ac8hfvw5k4k";
};
nativeBuildInputs = [ cmake ];

View file

@ -82,11 +82,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.4.95";
version = "1.4.96";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "1a7rk4r7phlf1y3ap3942z5sfvb6i4qglvq06qqhz49wq1wbgvq1";
sha256 = "12fdef417180d295170dd61ff0586e568a0c6475fabc0b3d003921ec924a84fc";
};
dontConfigure = true;

View file

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "1bahnvn6i08gg10r9p012n7xjwhnjk1xq4c70kw6sqr4p53423mn";
sha256bin64 = "066lvnh18k5982dv9481g9i31g9pq6a8q92g93xkqgj2bipbv6si";
version = "81.0.4044.26";
sha256 = "1yam7lg38dbpvmva7pc3bw3npvgi3d1v6im8ld4z92gjgniwsjh2";
sha256bin64 = "0vsly218wv9x2nv5i82slz8pmb0hmdcl1z2mlhf2j5adnsxn9c5z";
version = "81.0.4044.34";
};
dev = {
sha256 = "0k35sa1qq54cixybb12nyzkjyrwb4cbjfffwfvr5dl859i5bz1kk";
sha256bin64 = "0ckbgk6jw3zq3gqvvwdlcrqlm110hkvija6jfh9dk0ip1wdx8wkm";
version = "82.0.4062.3";
sha256 = "0pxvwjvkajlidk5m7jiqk69mxnxg3h56dr7vpi916r51w17pds0l";
sha256bin64 = "1jdyp0f2ig4251155db3m7lzd4jlmczcjqqnvdj5nwl2bn3ykc3s";
version = "82.0.4068.4";
};
stable = {
sha256 = "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8";
sha256bin64 = "0kipzd0q3p3wwklcl1fb937xhklc0s76apsfrjwy0jcmcy47blzf";
version = "80.0.3987.122";
sha256 = "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c";
sha256bin64 = "00xhacrs74ks3nrpsnnbqm5vk0r9ydyxrq5ifajzviqqyk2n24b8";
version = "80.0.3987.132";
};
}

View file

@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "palemoon";
version = "28.8.2.1";
version = "28.8.4";
src = fetchFromGitHub {
owner = "MoonchildProductions";
repo = "UXP";
rev = "PM${version}_Release";
sha256 = "1m7dfgy5vjw1ndjsh0aksvsp0ii2kj7gxn0sp3h0xgwi0yq7lwyb";
sha256 = "1k2j4rlgjwkns3a592pbiwwhrpja3fachvzby1his3d1mhdvyc6f";
};
desktopItem = makeDesktopItem {

View file

@ -17,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "2.11.1811.44-1";
version = "2.11.1811.47-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "1hzlcvbp056nzxdiig91rsm5f0s0cjqs0imlgn7822jadp9wwnwn";
sha256 = "16fw6v00xy66mxkkq0b4k49jd0wwlyyvxaaml2gglfk7swxy7i02";
};
unpackPhase = ''

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloudflared";
version = "2020.2.0";
version = "2020.2.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
sha256 = "1fzndqkmfpx15fllxqxbh7n4m13ydlp50dvkdh8n384j09ndmx4r";
sha256 = "1wyvf4bilhiwabqgdwmnhifwc845m4g17pz7xmndzvqwmfd7riw5";
};
modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p";

View file

@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "0hlvsi706jwlf43mdwic6j7iriii4daxjr82qgi80ac4h4x0z3h2";
sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf";
};
modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45";

View file

@ -3,7 +3,7 @@
buildGoModule rec {
pname = "kube3d";
version = "1.6.0";
k3sVersion = "1.17.3+k3s1";
k3sVersion = "1.17.3-k3s1";
goPackagePath = "github.com/rancher/k3d";

View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.5.10",
"version": "1.5.12",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {

View file

@ -1,4 +1,4 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, mkYarnPackage }:
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }:
# Notes for maintainers:
# * versions of `riot-web` and `riot-desktop` should be kept in sync.
@ -6,13 +6,14 @@
let
executableName = "riot-desktop";
version = "1.5.10";
version = "1.5.12";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "0yr5f3i24qh9b8hjfalpqxwr0qhs7hax450g83vf06skap1l5i5j";
sha256 = "1qz3n2dlklhbi6rbhv2v769xbr4rcp9s6pm2cc9r33ak6axn4aym";
};
electron = electron_7;
in mkYarnPackage rec {
name = "riot-desktop-${version}";
@ -45,7 +46,7 @@ in mkYarnPackage rec {
ln -s "${desktopItem}/share/applications" "$out/share/applications"
# executable wrapper
makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/riot/electron"
'';
@ -78,6 +79,6 @@ in mkYarnPackage rec {
homepage = https://about.riot.im/;
license = licenses.asl20;
maintainers = with maintainers; [ pacien worldofpeace ];
inherit (electron_5.meta) platforms;
inherit (electron.meta) platforms;
};
}

View file

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.5.10";
version = "1.5.12";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1c11x8903p38c0f9k3ff4pnpb3n7hzs4pj6g65a4cvp6jgg1zfnn";
sha256 = "064zghrsl348ydzngwxhwjn0d0gkkf3nkzq03v5gad2f11qwnwb6";
};
installPhase = ''

View file

@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.31.0"; # Please backport all updates to the stable channel.
version = "1.32.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "19vsv7jv30xvfgq1nr3091b6x4agymy9afpy9r9mxzgn0xfb0ap9";
sha256 = "1ggblpw2xxhm78sqadswcv0314zagksj34z8pywjnr8h9zkcyiap";
};
nativeBuildInputs = [
@ -127,7 +127,8 @@ in stdenv.mkDerivation rec {
Signal Desktop is an Electron application that links with your
"Signal Android" or "Signal iOS" app.
'';
homepage = https://signal.org/;
homepage = "https://signal.org/";
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ixmatus primeos equirosa ];
platforms = [ "x86_64-linux" ];

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "tribler";
version = "7.4.1";
version = "7.4.4";
src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
sha256 = "1s9hzr0n00d3hb1z2srq75j7mbml6csylb14hzy9psw27q2c0fqs";
sha256 = "0hxiyf1k07ngym2p8r1b5mcx1y2crkyz43gi9sgvsvsyijyaff3p";
};
nativeBuildInputs = [
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
maintainers = with maintainers; [ xvapx ];
homepage = https://www.tribler.org/;
homepage = "https://www.tribler.org/";
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
license = licenses.lgpl21;
platforms = platforms.linux;

View file

@ -4,15 +4,20 @@
stdenv.mkDerivation rec {
pname = "wayvnc";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
sha256 = "17c30c33zzhhlqzc4a5dd1y74ch7c8gsm98wvcn4n1fv50fbmpbd";
sha256 = "1qk8xrqd8ls2hpkj7g4aknr73x3lbzzdjpja16rbp2r0m4iv95ld";
};
postPatch = ''
substituteInPlace meson.build \
--replace "version: '0.1.0'" "version: '${version}'"
'';
nativeBuildInputs = [ meson pkg-config ninja ];
buildInputs = [ pixman libuv libGL libxkbcommon wayland neatvnc libdrm libX11 ];
@ -26,6 +31,7 @@ stdenv.mkDerivation rec {
display attached.
'';
inherit (src.meta) homepage;
changelog = "https://github.com/any1/wayvnc/releases/tag/v${version}";
license = licenses.isc;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];

View file

@ -1,14 +1,14 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages }:
buildGoPackage rec {
pname = "rclone";
version = "1.50.2";
version = "1.51.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0yaspkh88q8i58i8g8mm6sqb75hczavz2lvzdd1iif1bqgi6b5fz";
sha256 = "0z4kaq6wnj5dgl52g7f86phxlvnk5pbpda7prgh3hahpyhxj0z7d";
};
goPackagePath = "github.com/rclone/rclone";
@ -17,9 +17,19 @@ buildGoPackage rec {
outputs = [ "bin" "out" "man" ];
postInstall = ''
install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
'';
postInstall =
let
rcloneBin =
if stdenv.buildPlatform == stdenv.hostPlatform
then "$bin"
else stdenv.lib.getBin buildPackages.rclone;
in
''
install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
mkdir -p $bin/share/zsh/site-functions $bin/share/bash-completion/completions/
${rcloneBin}/bin/rclone genautocomplete zsh $bin/share/zsh/site-functions/_rclone
${rcloneBin}/bin/rclone genautocomplete bash $bin/share/bash-completion/completions/rclone.bash
'';
meta = with stdenv.lib; {
description = "Command line program to sync files and directories to and from major cloud storage";

View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "khronos";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "0dk1b2d82gli3z35dn5p002lfkgq326janql0vn1z5hs8jvjakqh";
sha256 = "0s6yx05k0x90bmdmr61hw07nf9a1kyvvk6gwlg8m97zq1n3qc0f3";
};
nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "workcraft";
version = "3.2.5";
version = "3.2.6";
src = fetchurl {
url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
sha256 = "11dk00b17yhk7cv8zms4nlffc0qwgsapimzr8csb89qmgabd7rj3";
sha256 = "1sfbxmk71gp7paw4l5azqr0lsgsyp4308gx2jz8w4k3nasfshz25";
};
buildInputs = [ makeWrapper ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = https://workcraft.org/;
homepage = "https://workcraft.org/";
description = "Framework for interpreted graph modeling, verification and synthesis";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.mit;

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gmsh";
version = "4.5.2";
version = "4.5.4";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
sha256 = "10i6i1s68lkccnl73lzr04cf1hc5rd8b7dpiaxs1vzrj1ljgw801";
sha256 = "1k9f7qxlwja9i40qy55070sjnr21bl165677mdqw7qyb8d7wgy6c";
};
buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL

View file

@ -9,11 +9,11 @@
}:
stdenv.mkDerivation {
name = "gromacs-2020";
name = "gromacs-2020.1";
src = fetchurl {
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.tar.gz";
sha256 = "00ds83n5wnm7g7wq91jycp8h82vnam5b4rwg3fv9rk9x5ca5czj7";
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz";
sha256 = "1kwrk3i1dxp8abhqqsl049lh361n4910h0415g052f8shdc6arp1";
};
nativeBuildInputs = [ cmake ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "0wqc9c30iydwylw53idff1ny2v410jcbhn7hpiinc4x5m3dy7827";
sha256 = "0jqr7i67s00gvi6cbww397jnh8qzwr37prd7frbl12j89glshwy1";
};
modSha256 = "191ds0dkllc0l2lbqnwlca26js90b2g9f70jsid0zhmz3z9f1zh9";
modSha256 = "03m193ny5z77yy586cwh099ypi1lmhb5vdj7d4kphxycnvpndr66";
buildFlagsArray = [
"-ldflags=-X github.com/cli/cli/command.Version=${version}"

View file

@ -1,11 +1,11 @@
{
"version": "12.8.1",
"repo_hash": "1h844a79scf3an5rv0wi332lrf7mv1zcv2mg6zllk82f7nf341gn",
"version": "12.8.2",
"repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.8.1-ee",
"rev": "v12.8.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "12.8.1",
"GITALY_SERVER_VERSION": "12.8.2",
"GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.21.0"

View file

@ -28,14 +28,14 @@ let
};
});
in buildGoPackage rec {
version = "12.8.1";
version = "12.8.2";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "0sjkh0j36dpakqmq7l5gd1ydmx1kxgij53bjvvn37r19liqdijnx";
sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic";
};
# Fix a check which assumes that hook files are writeable by their

View file

@ -1319,8 +1319,8 @@
fetch = {
type = "git";
url = "https://github.com/ugorji/go";
rev = "v1.1.4";
sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
rev = "d75b2dcb6bc8";
sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
};
}
{

View file

@ -1,31 +1,30 @@
{ stdenv
, fetchFromGitHub
, pkgconfig
, pkg-config
, glib
, glibc
, systemd
}:
stdenv.mkDerivation rec {
project = "conmon";
name = "${project}-${version}";
version = "2.0.10";
pname = "conmon";
version = "2.0.11";
src = fetchFromGitHub {
owner = "containers";
repo = project;
repo = pname;
rev = "v${version}";
sha256 = "194wach3yrkvll2xaj0x77hzlngk2016mflgnd5k8knjn2b9dgvl";
sha256 = "1mdnfkbbv41g590a1ja4rfw69z6kp03znyhikdmg6zqp4qsv32ib";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib systemd ] ++
stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
installPhase = "install -Dm755 bin/${project} $out/bin/${project}";
installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}";
meta = with stdenv.lib; {
homepage = https://github.com/containers/conmon;
homepage = "https://github.com/containers/conmon";
description = "An OCI container runtime monitor";
license = licenses.asl20;
maintainers = with maintainers; [ vdemeester saschagrunert ];

View file

@ -206,14 +206,14 @@ rec {
};
docker_19_03 = makeOverridable dockerGen {
version = "19.03.6";
rev = "369ce74a3ce86a392e39e45d3960ce970fdfac97";
sha256 = "0myvh7p9h0j4xc35zhcvp8cqxd3r6p6jx5zxl5rzh14m6lgzmkh0";
runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd";
version = "19.03.7";
rev = "7141c199a2edb2a90b778175f836f9dd2a22c95a";
sha256 = "1h1hrp6cw3ah2gaq2vfdd1d9vh7gyf7rs6bdxwpxk9ixc19fxsm4";
runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10
runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
containerdRev = "35bd7a5f69c13e1563af8a93431411cd9ecf5021";
containerdSha256 = "076355bkbdsgsxryhhr9gbpyypdx8gg149lylyd6q5ig98p179ap";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13
containerdSha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
};
}

View file

@ -11,9 +11,13 @@ let
in
{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args:
let
# Make base-64 encoded SRI hash filename-safe using RFC 4648 §5
tmpname = lib.replaceStrings [ "+" "/" "=" ] [ "-" "_" "" ] args.sha256;
in
fetchurl ({
postFetch = ''
tmpfile="$TMPDIR/${args.sha256}"
tmpfile="$TMPDIR/${tmpname}"
if [ ! -s "$out" ]; then
echo "error: Fetched patch file '$out' is empty!" 1>&2
exit 1

View file

@ -1,16 +1,29 @@
{ stdenv, fetchFromGitHub }:
{ stdenv
, substituteAll
, fetchFromGitHub
, libpulseaudio
, python3
}:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-sound-output-device-chooser";
version = "24";
version = "25";
src = fetchFromGitHub {
owner = "kgshank";
repo = "gse-sound-output-device-chooser";
rev = version;
sha256 = "0n1rf4pdf0b78ivmz89x223sqlzv30qydkvlnvn7hwx0j32kyr0x";
sha256 = "16xaa4r01575ix9lrvww8n6pird8r3ml1j037b3sm6dfrf8kvzxs";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
libpulse = "${libpulseaudio}/lib/libpulse.so";
python = python3.interpreter;
})
];
dontBuild = true;
uuid = "sound-output-device-chooser@kgshank.net";
@ -23,6 +36,6 @@ stdenv.mkDerivation rec {
description = "GNOME Shell extension adding audio device chooser to panel";
license = licenses.gpl3;
maintainers = with maintainers; [ jtojnar ];
homepage = https://github.com/kgshank/gse-sound-output-device-chooser;
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
};
}

View file

@ -0,0 +1,22 @@
--- a/sound-output-device-chooser@kgshank.net/convenience.js
+++ b/sound-output-device-chooser@kgshank.net/convenience.js
@@ -111,7 +111,7 @@ function refreshCards() {
log("New logic");
let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path();
try {
- let [result, out, err, exit_code] = GLib.spawn_command_line_sync('python ' + pyLocation);
+ let [result, out, err, exit_code] = GLib.spawn_command_line_sync('@python@ ' + pyLocation);
// log("result" + result +" out"+out + " exit_code" + exit_code + "
// err" +err);
if(result && !exit_code) {
--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
@@ -86,7 +86,7 @@ else:
_libraries = {}
-libpulse_library_name = find_library('pulse')
+libpulse_library_name = '@libpulse@'
if libpulse_library_name is None:
raise Exception('No libpulse.so library found!')

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "closure-compiler";
version = "20200204";
version = "20200224";
src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
sha256 = "0diqnvyfh8w7yf7l5zqvb4msw07n50k9grz0k2znykaqwmjsidx9";
sha256 = "0qlnpnd64rrlyz7ybdnp7zk5ns2s0071zs1fcrcq9ba2lnhfbmmb";
};
sourceRoot = ".";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A tool for making JavaScript download and run faster";
homepage = https://developers.google.com/closure/compiler/;
homepage = "https://developers.google.com/closure/compiler/";
license = licenses.asl20;
platforms = platforms.all;
};

View file

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.6.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "1fvy2j6pw1rwm0rg7555q3qg2069cx2b9lk0nsyc3jxsqp9hbn6i";
sha256 = "1bcxq7bgn0kf1vdw6id8s3izz6mwf3ivr8iph4miig302qm9lmmr";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "1vhra9v4jsy9hyhjrmxjy6rnraxz13h1b7l51xvbai5wxsxm7z8m";
cargoSha256 = "17bvms65frxhw0d196qswh3jjqlriidq3xi3mfjjgfh6n17rh608";
meta = with stdenv.lib; {
description = "A statically typed language for the Erlang VM";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "joker";
version = "0.14.1";
version = "0.14.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
sha256 = "0da07fswj7x87njd9bi3gf8rzfyaq3zfcszgyb37w7q0ng4gg25n";
sha256 = "1wi80sr8h9fwh4xipff0y6qdzrliwyk2w1bmi33ncykxd9r2g7nk";
};
modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
@ -20,7 +20,7 @@ buildGoModule rec {
subPackages = [ "." ];
meta = with stdenv.lib; {
homepage = https://github.com/candid82/joker;
homepage = "https://github.com/candid82/joker";
description = "A small Clojure interpreter and linter written in Go";
license = licenses.epl10;
platforms = platforms.all;

View file

@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
version = "9.2.10.0";
version = "9.2.11.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "0lwmqyg06rv3iyhmfnqcg4xzaxcfrgjivjrc4ljwb0y629vp16ci";
sha256 = "01yzpasnpqqm0vfc0ki8vkxbzijjfws135jw8k0r50b5lahjvs4a";
};
buildInputs = [ makeWrapper ];
@ -48,7 +48,7 @@ jruby = stdenv.mkDerivation rec {
meta = {
description = "Ruby interpreter written in Java";
homepage = http://jruby.org/;
homepage = "http://jruby.org/";
license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ];
platforms = stdenv.lib.platforms.unix;
};

View file

@ -286,7 +286,7 @@ in {
};
php74 = generic {
version = "7.4.2";
sha256 = "05p8z0ld058yjanxaphy3ka20hn7x7d6nak5sm782w4wprs9k402";
version = "7.4.3";
sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ=";
};
}

View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "liblo-0.30";
name = "liblo-0.31";
src = fetchurl {
url = "mirror://sourceforge/liblo/liblo/0.30/${name}.tar.gz";
sha256 = "06wdjzxjdshr6hyl4c94yvg3jixiylap8yjs8brdfpm297gck9rh";
url = "mirror://sourceforge/liblo/liblo/0.31/${name}.tar.gz";
sha256 = "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb";
};
doCheck = false; # fails 1 out of 3 tests
meta = {
description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
homepage = https://sourceforge.net/projects/liblo;
homepage = "https://sourceforge.net/projects/liblo";
license = stdenv.lib.licenses.gpl2;
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = with stdenv.lib.platforms; linux ++ darwin;

View file

@ -3,7 +3,8 @@
, meson
, ninja
, pkgconfig
, fetchpatch
, libxslt
, docbook-xsl-ns
, glib
, gdk-pixbuf
, gobject-introspection
@ -12,24 +13,15 @@
stdenv.mkDerivation rec {
pname = "libnotify";
version = "0.7.8";
version = "0.7.9";
outputs = [ "out" "dev" ];
outputs = [ "out" "man" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1371csx0n92g60b5dmai4mmzdnx8081mc3kcgc6a0xipcq5rw839";
sha256 = "ZsBRftFt968ljoMgj6r1Bpcn39ZplcS7xRwWlU1nR2E=";
};
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";
})
];
mesonFlags = [
# disable tests as we don't need to depend on GTK (2/3)
"-Dtests=false"
@ -42,6 +34,8 @@ stdenv.mkDerivation rec {
meson
ninja
pkgconfig
libxslt
docbook-xsl-ns
];
propagatedBuildInputs = [

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libqalculate";
version = "3.7.0";
version = "3.8.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
sha256 = "0g3047lwd0rh0dds196iija3kq06mhkh6y8x5whcbv3s0db66h18";
sha256 = "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df";
};
outputs = [ "out" "dev" "doc" ];
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An advanced calculator library";
homepage = http://qalculate.github.io;
homepage = "http://qalculate.github.io";
maintainers = with maintainers; [ gebner ];
license = licenses.gpl2Plus;
platforms = platforms.all;

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "talloc";
version = "2.1.16";
version = "2.3.1";
src = fetchurl {
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
sha256 = "1aajda08yf7njgvg6r21ccxlvkarb9bwvf4jqh8yn3871a1zcnqr";
sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g";
};
nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Hierarchical pool based memory allocator with destructors";
homepage = https://tdb.samba.org/;
homepage = "https://tdb.samba.org/";
license = licenses.gpl3;
platforms = platforms.all;
};

View file

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "ROPGadget";
version = "6.0";
version = "6.2";
src = fetchPypi {
inherit pname version;
sha256 = "02wgrdrg0s0cr9yjsb4945244m8x8rr8jzxr8h8c6k2na4d17xf4";
sha256 = "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh";
};
propagatedBuildInputs = [ capstone ];

View file

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msal";
version = "1.0.0";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc";
sha256 = "16l2bmmm5pdlb61av5748mhy0lg9r965lmyn69is6mhsyr9zi38s";
};
propagatedBuildInputs = [

View file

@ -18,13 +18,13 @@ let
in buildPythonPackage rec {
pname = "python-mapnik";
version = "3.0.16";
version = "unstable-2020-02-24";
src = pkgs.fetchFromGitHub {
owner = "mapnik";
repo = "python-mapnik";
rev = "v${version}";
sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc";
rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b";
sha256 = "0snn7q7w1ab90311q8wgd1z64kw1svm5w831q0xd6glqhah86qc8";
};
disabled = isPyPy;

View file

@ -0,0 +1,31 @@
{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }:
buildPythonPackage rec {
pname = "sapi-python-client";
version = "0.1.3";
src = fetchFromGitHub {
owner = "keboola";
repo = pname;
rev = version;
sha256 = "1xja4v5d30hy26lfys21vcz1lcs88v8mvjxwl2dc3wxx2pzdvcf6";
};
postPatch = ''
sed -i 's|use_scm_version=True|version="${version}"|' setup.py
'';
doCheck = false; # requires API token and an active keboola bucket
nativeBuildInputs = [ git setuptools_scm ];
propagatedBuildInputs = [ setuptools requests boto3 responses ];
meta = with stdenv.lib; {
description = "Keboola Connection Storage API client";
homepage = "https://github.com/keboola/sapi-python-client";
maintainers = with maintainers; [ mrmebelman ];
license = licenses.mit;
};
}

View file

@ -2,17 +2,17 @@
buildPythonPackage rec {
pname = "spotipy";
version = "2.7.1";
version = "2.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "1i4gpmvjk608fxz1kwfb3dnmm4dydr0bir0zw9k2nng7n8b6knvr";
sha256 = "163z3j0sd9a7cc9pv9hcrh230gisvvi2fxabh1f6nzhfr8avrncr";
};
propagatedBuildInputs = [ requests ];
meta = with stdenv.lib; {
homepage = https://spotipy.readthedocs.org/;
homepage = "https://spotipy.readthedocs.org/";
description = "A light weight Python library for the Spotify Web API";
license = licenses.mit;
maintainers = [ maintainers.rvolosatovs ];

View file

@ -1,4 +1,4 @@
{ stdenv, pkgs, bazel_1, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
{ stdenv, pkgs, bazel_0, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
, addOpenGLRunpath
# Python deps
, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
@ -94,7 +94,7 @@ let
bazel-build = buildBazelPackage {
name = "${pname}-${version}";
bazel = bazel_1;
bazel = bazel_0;
src = fetchFromGitHub {
owner = "tensorflow";
@ -121,7 +121,6 @@ let
sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz";
})
./tf-1.15-bazel-1.0.patch
(fetchpatch {
# be compatible with gast >0.2 instead of only gast 0.2.2
@ -283,7 +282,6 @@ let
bazelFlags = [
# temporary fixes to make the build work with bazel 0.27
"--incompatible_no_support_tools_in_action_inputs=false"
"--incompatible_use_native_patch=false"
];
bazelBuildFlags = [
"--config=opt" # optimize using the flags set in the configure phase
@ -299,9 +297,9 @@ let
# FIXME: can't (re)produce this output with current bazel.
# FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35
sha256 = if cudaSupport then
"0gyhjvzshgj59mbns8njlfl9qpz4sdg4j0xs2dva0w2nql7cr7im"
"0bzkqjnw1crf0v91yb1frvy0l7kmjawbfwdhm89h73i8fqjab8jw"
else
"04jvg3mc2si4xdbszc1vnw1rmf22p7snbjphmnklp7bc39jxkcrz";
"1d7czp43a3a4aksvdcskbdy7dgifily1amqbz9fa6d8mkhdj5if5";
};
buildAttrs = {
@ -422,6 +420,9 @@ in buildPythonPackage {
x = np.random.uniform(size=(1,1))
y = np.random.uniform(size=(1,))
model.fit(x, y, epochs=1)
# regression test for #77626
from tensorflow.contrib import tensor_forest
EOF
'';

View file

@ -1,213 +0,0 @@
diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
index f740ba66b5..6cc9003787 100644
--- a/tensorflow/c/BUILD
+++ b/tensorflow/c/BUILD
@@ -270,6 +270,7 @@ tf_cuda_library(
"//tensorflow/core/platform",
"@com_google_absl//absl/strings",
],
+ alwayslink = 1,
)
exports_files(
diff --git a/tensorflow/c/eager/BUILD b/tensorflow/c/eager/BUILD
index 5c42e508f7..16b421862c 100644
--- a/tensorflow/c/eager/BUILD
+++ b/tensorflow/c/eager/BUILD
@@ -79,6 +79,7 @@ tf_cuda_library(
"//tensorflow/core/profiler/lib:profiler_session",
"//tensorflow/core:gpu_runtime",
],
+ alwayslink = 1,
)
tf_cuda_library(
@@ -226,6 +227,7 @@ tf_cuda_library(
"//tensorflow/core/profiler/rpc/client:capture_profile",
"//tensorflow/core:gpu_runtime",
],
+ alwayslink = 1,
)
tf_cuda_cc_test(
diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD
index 39b84922d1..b2affdd999 100644
--- a/tensorflow/cc/saved_model/BUILD
+++ b/tensorflow/cc/saved_model/BUILD
@@ -123,6 +123,7 @@ cc_library(
"//tensorflow/core/util/tensor_bundle:naming",
# mobile not supported yet
]),
+ alwayslink = 1,
)
tf_cc_test(
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index c23c1f9b39..805643b217 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -777,6 +777,7 @@ cc_library(
":lib_proto_parsing",
":protos_all_cc",
],
+ alwayslink = 1,
)
# DEPRECATED: use platform:stringpiece instead.
@@ -2496,6 +2497,7 @@ cc_library(
"@com_google_protobuf//:protobuf",
] + tf_protos_all_impl() + tf_protos_grappler_impl() +
tf_additional_numa_deps(),
+ alwayslink = 1,
)
# File compiled with extra flags to get cpu-specific acceleration.
diff --git a/tensorflow/core/lib/random/BUILD b/tensorflow/core/lib/random/BUILD
index 3bd933261b..e1e589e76d 100644
--- a/tensorflow/core/lib/random/BUILD
+++ b/tensorflow/core/lib/random/BUILD
@@ -50,6 +50,7 @@ cc_library(
"//tensorflow/core/platform:types",
"//third_party/eigen3",
],
+ alwayslink = 1,
)
filegroup(
diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
index 5459d8d428..feba3a5686 100644
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@@ -228,6 +228,7 @@ def cc_proto_library(
hdrs = gen_hdrs,
deps = cc_libs + deps,
includes = includes,
+ alwayslink = 1,
**kargs
)
native.cc_library(
diff --git a/tensorflow/lite/java/src/test/native/BUILD b/tensorflow/lite/java/src/test/native/BUILD
index 6dcdab2aee..32bb0a8d85 100644
--- a/tensorflow/lite/java/src/test/native/BUILD
+++ b/tensorflow/lite/java/src/test/native/BUILD
@@ -19,6 +19,7 @@ cc_library(
"//tensorflow/lite/java/jni",
"//tensorflow/lite/kernels:kernel_util",
],
+ alwayslink = 1,
)
tflite_jni_binary(
diff --git a/tensorflow/lite/python/testdata/BUILD b/tensorflow/lite/python/testdata/BUILD
index 7bda81358f..ac1188d844 100644
--- a/tensorflow/lite/python/testdata/BUILD
+++ b/tensorflow/lite/python/testdata/BUILD
@@ -60,6 +60,7 @@ cc_library(
deps = [
"//tensorflow/lite/c:c_api_internal",
],
+ alwayslink = 1,
)
cc_binary(
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 6fd9b4f273..29df3a3dff 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -375,6 +375,7 @@ cc_library(
"//tensorflow/core:lib",
"//tensorflow/core:protos_all_cc",
],
+ alwayslink = 1,
)
cc_library(
@@ -411,6 +412,7 @@ cc_library(
"//third_party/py/numpy:headers",
"//third_party/python_runtime:headers",
],
+ alwayslink = 1,
)
cc_library(
@@ -617,6 +619,7 @@ cc_library(
"//tensorflow/core:op_gen_lib",
"//tensorflow/core:protos_all_cc",
],
+ alwayslink = 1,
)
py_library(
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index a3956322fe..32752f59ad 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -2331,6 +2331,7 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs, protodeps = []
hdrs = out_hdrs,
visibility = visibility,
deps = deps,
+ alwayslink = 1,
)
def tf_genrule_cmd_append_to_srcs(to_append):
diff --git a/tensorflow/tools/graph_transforms/BUILD b/tensorflow/tools/graph_transforms/BUILD
index adafe2aca1..8965316b12 100644
--- a/tensorflow/tools/graph_transforms/BUILD
+++ b/tensorflow/tools/graph_transforms/BUILD
@@ -223,6 +223,7 @@ cc_library(
"//tensorflow/core:lib_internal",
"//tensorflow/core:protos_all_cc",
],
+ alwayslink = 1,
)
# This library includes a main function, to make it easy to create other
diff --git a/third_party/icu/data/BUILD.bazel b/third_party/icu/data/BUILD.bazel
index 7db21566e4..8e18c7cc3a 100644
--- a/third_party/icu/data/BUILD.bazel
+++ b/third_party/icu/data/BUILD.bazel
@@ -43,4 +43,5 @@ cc_library(
name = "conversion_data",
srcs = [":conversion_data.c"],
deps = ["@icu//:headers"],
+ alwayslink = 1,
)
diff --git a/third_party/protobuf/protobuf.patch b/third_party/protobuf/protobuf.patch
index df0648563d..18fc6cdf35 100644
--- a/third_party/protobuf/protobuf.patch
+++ b/third_party/protobuf/protobuf.patch
@@ -11,7 +11,15 @@ index 2fb26050..c2744d5b 100644
################################################################################
# Protobuf Runtime Library
-@@ -218,7 +218,7 @@ cc_library(
+@@ -209,6 +209,7 @@ cc_library(
+ copts = COPTS,
+ includes = ["src/"],
+ linkopts = LINK_OPTS,
++ alwayslink = 1,
+ visibility = ["//visibility:public"],
+ deps = [":protobuf_lite"] + PROTOBUF_DEPS,
+ )
+@@ -219,7 +220,7 @@ cc_library(
# TODO(keveman): Remove this target once the support gets added to Bazel.
cc_library(
name = "protobuf_headers",
@@ -20,3 +28,4 @@ index 2fb26050..c2744d5b 100644
includes = ["src/"],
visibility = ["//visibility:public"],
)
+
\ No newline at end of file
diff --git a/third_party/systemlibs/protobuf.bzl b/third_party/systemlibs/protobuf.bzl
index 774514f3fd..1c415b018b 100644
--- a/third_party/systemlibs/protobuf.bzl
+++ b/third_party/systemlibs/protobuf.bzl
@@ -262,6 +262,7 @@ def cc_proto_library(
hdrs = gen_hdrs,
deps = cc_libs + deps,
includes = includes,
+ alwayslink = 1,
**kargs
)

View file

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.0.2";
version = "2.0.4";
dontConfigure = true;
dontBuild = true;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "11siv8qmj4arl6qxks7bqnhx5669r3kxqcxq37ai7sf9f7v78k1i";
sha256 = "02sqs7shxqrq6c6h12ldskk30k7sisa75wjxz99xyg49m4b2lw4m";
};
nativeBuildInputs = [

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
version = "4.2.1";
version = "4.2.2";
pname = "randoop";
src = fetchurl {
url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
sha256 = "0sq6zyagb8qrj629rq7amzi0dnm6q00mll6gd5yx1nqdnjbfb4qd";
sha256 = "1ac4llphh16n5ihc2hb1vggl65mbkw1xd1j3ixfskvmcy8valgqw";
};
buildInputs = [ unzip ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Automatic test generation for Java";
homepage = https://randoop.github.io/randoop/;
homepage = "https://randoop.github.io/randoop/";
license = licenses.mit;
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
version = "10.3.2";
version = "10.3.4";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "v${version}";
sha256 = "0n4yns81kwwx725smsgqg8hc693ygqlzrgkqdrhrfszkpm205479";
rev = version;
sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g";
};
subPackages = [ "." ];

View file

@ -0,0 +1,375 @@
{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
, zip, unzip, bash, writeCBin, coreutils
, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
# Apple dependencies
, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
, buildJdk, runJdk
, buildJdkName
, runtimeShell
# Always assume all markers valid (don't redownload dependencies).
# Also, don't clean up environment variables.
, enableNixHacks ? false
}:
let
srcDeps = [
# From: $REPO_ROOT/WORKSPACE
(fetchurl {
url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip";
sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7";
})
(fetchurl {
url = "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz";
sha256 = "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f";
})
(fetchurl {
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz";
sha256 = "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52";
})
(fetchurl {
url = "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz";
sha256 = "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898";
})
(fetchurl {
url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_linux-v3.1.zip";
sha256 = "a0cd51f9db1bf05a722ff7f5c60a07fa1c7d27428fff0815c342d32aa6c53576";
})
(fetchurl {
url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_darwin-v3.1.zip";
sha256 = "c646aad8808b8ec5844d6a80a1287fc8e13203375fe40d6af4819eff48b9bbaf";
})
(fetchurl {
url = "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip";
sha256 = "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889";
})
(fetchurl {
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip";
sha256 = "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0";
})
(fetchurl {
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz";
sha256 = "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f";
})
];
distDir = runCommand "bazel-deps" {} ''
mkdir -p $out
for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
'';
defaultShellPath = lib.makeBinPath
# Keep this list conservative. For more exotic tools, prefer to use
# @rules_nixpkgs to pull in tools from the nix repository. Example:
#
# WORKSPACE:
#
# nixpkgs_git_repository(
# name = "nixpkgs",
# revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
# )
#
# # This defines an external Bazel workspace.
# nixpkgs_package(
# name = "bison",
# repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
# )
#
# some/BUILD.bazel:
#
# genrule(
# ...
# cmd = "$(location @bison//:bin/bison) -other -args",
# tools = [
# ...
# "@bison//:bin/bison",
# ],
# )
#
[ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ];
# Java toolchain used for the build and tests
javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
in
stdenv.mkDerivation rec {
version = "0.26.0";
meta = with lib; {
homepage = "https://github.com/bazelbuild/bazel/";
description = "Build tool that builds code quickly and reliably";
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
};
# Additional tests that check bazels functionality. Execute
#
# nix-build . -A bazel.tests
#
# in the nixpkgs checkout root to exercise them locally.
passthru.tests = {
pythonBinPath = callPackage ./python-bin-path-test.nix {};
bashTools = callPackage ./bash-tools-test.nix {};
};
name = "bazel-${version}";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip";
sha256 = "d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2";
};
# Necessary for the tests to pass on Darwin with sandbox enabled.
# Bazel starts a local server and needs to bind a local address.
__darwinAllowLocalNetworking = true;
sourceRoot = ".";
patches = [
./glibc.patch
./python-stub-path-fix.patch
] ++ lib.optional enableNixHacks ../nix-hacks.patch;
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
customBash = writeCBin "bash" ''
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
extern char **environ;
int main(int argc, char *argv[]) {
char *path = getenv("PATH");
char *pathToAppend = "${defaultShellPath}";
char *newPath;
if (path != NULL) {
int length = strlen(path) + 1 + strlen(pathToAppend) + 1;
newPath = malloc(length * sizeof(char));
snprintf(newPath, length, "%s:%s", path, pathToAppend);
} else {
newPath = pathToAppend;
}
setenv("PATH", newPath, 1);
execve("${bash}/bin/bash", argv, environ);
return 0;
}
'';
postPatch = let
darwinPatches = ''
# Disable Bazel's Xcode toolchain detection which would configure compilers
# and linkers from Xcode instead of from PATH
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
# Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
export GCOV=${coreutils}/bin/false
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
# don't use system installed Xcode to run clang, use Nix clang instead
sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
scripts/bootstrap/compile.sh \
src/tools/xcode/realpath/BUILD \
src/tools/xcode/stdredirect/BUILD \
tools/osx/BUILD
# nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
# clang installed from Xcode has a compatibility wrapper that forwards
# invocations of gcc to clang, but vanilla clang doesn't
sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
for wrapper in "''${wrappers[@]}"; do
sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
done
'';
genericPatches = ''
# Substitute python's stub shebang to plain python path. (see TODO add pr URL)
# See also `postFixup` where python is added to $out/nix-support
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\
--replace "/usr/bin/env python" "${python}/bin/python" \
--replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|' \
src/BUILD
# substituteInPlace is rather slow, so prefilter the files with grep
grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
# If you add more replacements here, you must change the grep above!
# Only files containing /bin are taken into account.
substituteInPlace "$path" \
--replace /bin/bash ${customBash}/bin/bash \
--replace /usr/bin/env ${coreutils}/bin/env \
--replace /bin/true ${coreutils}/bin/true
done
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
substituteInPlace scripts/bootstrap/compile.sh \
--replace /bin/bash ${customBash}/bin/bash
# add nix environment vars to .bazelrc
cat >> .bazelrc <<EOF
build --experimental_distdir=${distDir}
fetch --experimental_distdir=${distDir}
build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
build --host_javabase='@local_jdk//:jdk'
build --host_java_toolchain='${javaToolchain}'
EOF
# add the same environment vars to compile.sh
sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
-e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
-e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
-e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
-i scripts/bootstrap/compile.sh
# --experimental_strict_action_env (which will soon become the
# default, see bazelbuild/bazel#2574) hardcodes the default
# action environment to a value that on NixOS at least is bogus.
# So we hardcode it to something useful.
substituteInPlace \
src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
--replace /bin:/usr/bin ${defaultShellPath}
# This is necessary to avoid:
# "error: no visible @interface for 'NSDictionary' declares the selector
# 'initWithContentsOfURL:error:'"
# This can be removed when the apple_sdk is upgraded beyond 10.13+
sed -i '/initWithContentsOfURL:versionPlistUrl/ {
N
s/error:nil\];/\];/
}' tools/osx/xcode_locator.m
# append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
patchShebangs .
'';
in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
+ genericPatches;
buildInputs = [
buildJdk
];
# when a command cant be found in a bazel build, you might also
# need to add it to `defaultShellPath`.
nativeBuildInputs = [
zip
python
unzip
makeWrapper
which
customBash
] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
# Bazel makes extensive use of symlinks in the WORKSPACE.
# This causes problems with infinite symlinks if the build output is in the same location as the
# Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
# subdirectory.
# Failing to do this causes "infinite symlink expansion detected"
preBuildPhases = ["preBuildPhase"];
preBuildPhase = ''
mkdir bazel_src
shopt -s dotglob extglob
mv !(bazel_src) bazel_src
'';
buildPhase = ''
# Increasing memory during compilation might be necessary.
# export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
./bazel_src/compile.sh
./bazel_src/scripts/generate_bash_completion.sh \
--bazel=./bazel_src/output/bazel \
--output=./bazel_src/output/bazel-complete.bash \
--prepend=./bazel_src/scripts/bazel-complete-header.bash \
--prepend=./bazel_src/scripts/bazel-complete-template.bash
'';
installPhase = ''
mkdir -p $out/bin
# official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
# if it cant find something in tools, it calls $out/bin/bazel-real
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
mv ./bazel_src/output/bazel $out/bin/bazel-real
wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}"
# shell completion files
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel
cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
'';
# Temporarily disabling for now. A new approach is needed for this derivation as Bazel
# accesses the internet during the tests which fails in a sandbox.
doInstallCheck = false;
installCheckPhase = ''
export TEST_TMPDIR=$(pwd)
hello_test () {
$out/bin/bazel test \
--test_output=errors \
--java_toolchain='${javaToolchain}' \
examples/cpp:hello-success_test \
examples/java-native/src/test/java/com/example/myproject:hello
}
cd ./bazel_src
# test whether $WORKSPACE_ROOT/tools/bazel works
mkdir -p tools
cat > tools/bazel <<"EOF"
#!${runtimeShell} -e
exit 1
EOF
chmod +x tools/bazel
# first call should fail if tools/bazel is used
! hello_test
cat > tools/bazel <<"EOF"
#!${runtimeShell} -e
exec "$BAZEL_REAL" "$@"
EOF
# second call succeeds because it defers to $out/bin/bazel-real
hello_test
'';
# Save paths to hardcoded dependencies so Nix can detect them.
postFixup = ''
mkdir -p $out/nix-support
echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
# The templates get tard up into a .jar,
# so nix cant detect python is needed in the runtime closure
echo "${python}" >> $out/nix-support/depends
'';
dontStrip = true;
dontPatchELF = true;
}

View file

@ -0,0 +1,78 @@
From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853
From: Benjamin Peterson <benjamin@dropbox.com>
Date: Fri, 3 May 2019 08:11:00 -0700
Subject: [PATCH] Rename gettid() functions.
glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
---
src/core/lib/gpr/log_linux.cc | 6 ++----
src/core/lib/gpr/log_posix.cc | 4 ++--
src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
index 81026e5689b..8b597b4cf2f 100644
--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc
+++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc
@@ -40,7 +40,7 @@
#include <time.h>
#include <unistd.h>
-static long gettid(void) { return syscall(__NR_gettid); }
+static long sys_gettid(void) { return syscall(__NR_gettid); }
void gpr_log(const char* file, int line, gpr_log_severity severity,
const char* format, ...) {
@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
struct tm tm;
static __thread long tid = 0;
- if (tid == 0) tid = gettid();
+ if (tid == 0) tid = sys_gettid();
timer = static_cast<time_t>(now.tv_sec);
final_slash = strrchr(args->file, '/');
diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
index b6edc14ab6b..2f7c6ce3760 100644
--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc
+++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc
@@ -31,7 +31,7 @@
#include <string.h>
#include <time.h>
-static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
+static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
void gpr_log(const char* file, int line, gpr_log_severity severity,
const char* format, ...) {
@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
char* prefix;
gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
gpr_log_severity_string(args->severity), time_buffer,
- (int)(now.tv_nsec), gettid(), display_file, args->line);
+ (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
fprintf(stderr, "%-70s %s\n", prefix, args->message);
gpr_free(prefix);
diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
index c2d80c08ddb..4a83cb6c215 100644
--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
+++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
}
#ifndef NDEBUG
-static long gettid(void) { return syscall(__NR_gettid); }
+static long sys_gettid(void) { return syscall(__NR_gettid); }
#endif
/* pollset->mu lock must be held by the caller before calling this.
@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
#define WORKER_PTR (&worker)
#endif
#ifndef NDEBUG
- WORKER_PTR->originator = gettid();
+ WORKER_PTR->originator = sys_gettid();
#endif
if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
gpr_log(GPR_INFO,

View file

@ -0,0 +1,13 @@
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
index dac21c9a83..69b11c283f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
@@ -67,7 +67,7 @@ def FindPythonBinary(module_space):
return os.path.join(module_space, PYTHON_BINARY)
else:
# Case 4: Path has to be looked up in the search path.
- return SearchPath(PYTHON_BINARY)
+ return "NIX_STORE_PYTHON_PATH"
def CreatePythonPathEntries(python_imports, module_space):
parts = python_imports.split(':');

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
python waf-light build${wafToolsArg}
'';
installPhase = ''
install waf $out
install -D waf $out/bin/waf
'';
meta = with stdenv.lib; {

View file

@ -3,7 +3,7 @@ wafConfigurePhase() {
if ! [ -f "${wafPath:=./waf}" ]; then
echo "copying waf to $wafPath..."
cp @waf@ "$wafPath"
cp @waf@/bin/waf "$wafPath"
fi
if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then

View file

@ -4,13 +4,13 @@
buildGoPackage rec {
pname = "buildah";
version = "1.14.1";
version = "1.14.2";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "12x80g83xjcjiafcxyqrhg952nq5w91df35d7lnvc2vz8vvpkyx1";
sha256 = "1475k8h1l8rbbs6hyq9gxksh9884l1674z77fmiyr5vzql5yf7ca";
};
outputs = [ "bin" "man" "out" ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.204.3";
version = "2.204.4";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "1sn9km7r3dbhbchn1szmhkwmx5im3qmy4lkzv4gm2aw1j9pghdda";
sha256 = "0m4g0hm7cfmma5lrs9jsdy2gzp383hhh4k968s41krdms2pf5jhf";
};
buildCommand = ''

View file

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "mdsh";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "zimbatm";
repo = "mdsh";
rev = "v${version}";
sha256 = "1a9i6h8fzrrfzjyfxaps73lxgkz92k0bnmwbjbwdmiwci4qgi9ms";
sha256 = "0y0k6rsspvpia4lssals4c3rdz9fgvlrhwd8gw38say02hn5b7ip";
};
cargoSha256 = "1fxajh1n0qvcdas6w7dy3g92wilhfldy90pyk3779mrnh57fa6n5";
cargoSha256 = "07f2ajg9jpp666915cwsjn5clmi9ghkw25qfqj0lj3kfj79n5ash";
meta = with stdenv.lib; {
description = "Markdown shell pre-processor";
homepage = https://github.com/zimbatm/mdsh;
homepage = "https://github.com/zimbatm/mdsh";
license = with licenses; [ mit ];
maintainers = with maintainers; [ zimbatm ];
platforms = platforms.all;

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, jre_headless, makeWrapper }:
let
version = "6.2.2";
version = "6.2.4";
in
stdenv.mkDerivation {
pname = "flyway";
inherit version;
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
sha256 = "09x62dbid9gx26q8m7gz4b21kinsx1ag3961krbxks28ihmwlm6a";
sha256 = "1ng4ygd44hl63amjaizldsngn72jfz5pqw7wgr1vyvdxdzjfcnwm";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "20200121T234305";
version = "20200305T151710";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
sha256 = "04598vxay85q2blr49xh4pb58i4rsgjbznnn2cszcqgyzh05fs4y";
sha256 = "0zi05skp36azv0b6spxdscal32cj5rc6g0d0gzfnsaavvxd128lg";
};
dontUnpack = true;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-license-detector";
version = "3.0.2";
version = "3.1.0";
src = fetchFromGitHub {
owner = "src-d";
repo = pname;
rev = "v${version}";
sha256 = "0gp7na2hqn5crr5x4khllsq7ka9h7rx8b4y10yzxmi0wpmxr53sw";
sha256 = "0ln1z3y9q5igf9djkxw05ql2hb1ijcvvz0mrbwz11cdv9xrsa4z4";
};
modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb";

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-xbuild";
version = "0.5.24";
version = "0.5.28";
src = fetchFromGitHub {
owner = "rust-osdev";
repo = pname;
rev = "v${version}";
sha256 = "1haq8gv4k6qgihyjplf76589d2hbb1720g6yvwk88aksjxmqj4jm";
sha256 = "1rczflf6fllxkag5nah195shwqvqmlna9a1gkcwp9ljlgxlr9zvq";
};
cargoSha256 = "08y64yqvar1ph1pcbh6lhqf4kj85zw74dfg0ii9lycvzxvkwvhqp";
cargoSha256 = "0xr8wpcw3x0343hm6clygsbikhrp6gcqb8vh7g7h9nijjrbnzxxb";
meta = with stdenv.lib; {
description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";

View file

@ -5,6 +5,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "13.9.0";
sha256 = "0z68hj3z2y8aj4bc14h77mj5l99jb4ljjc10gp0dpg8s4g1x5xzw";
version = "13.10.1";
sha256 = "14pvqwhilq210zn830zmh04a62rj3si0ijc4ihrhdf3dvghrx2c3";
}

View file

@ -0,0 +1,347 @@
--- a/hdsploader/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/hdsploader/Makefile.am 2019-06-28 00:43:41.557803832 +0800
@@ -32,5 +32,14 @@
tobin.c
CLEANFILES = $(dsp_hex_files)
-$(dsp_hex_files): tobin
- ./tobin
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(tobin_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(tobin_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(tobin_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+tobin$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(dsp_hex_files): tobin$(BUILD_EXEEXT)
+ ./$<
--- a/m4/ax_prog_cc_for_build.m4 2019-06-27 15:50:02.274134717 +0800
+++ b/m4/ax_prog_cc_for_build.m4 2019-06-28 01:32:45.088117432 +0800
@@ -0,0 +1,125 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_PROG_CC_FOR_BUILD
+#
+# DESCRIPTION
+#
+# This macro searches for a C compiler that generates native executables,
+# that is a C compiler that surely is not a cross-compiler. This can be
+# useful if you have to generate source code at compile-time like for
+# example GCC does.
+#
+# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
+# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
+# The value of these variables can be overridden by the user by specifying
+# a compiler with an environment variable (like you do for standard CC).
+#
+# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
+# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
+# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
+# substituted in the Makefile.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 9
+
+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_CPP])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+dnl Use the standard macros, but make them use other variable names
+dnl
+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
+pushdef([ac_cv_objext], ac_cv_build_objext)dnl
+pushdef([ac_exeext], ac_build_exeext)dnl
+pushdef([ac_objext], ac_build_objext)dnl
+pushdef([CC], CC_FOR_BUILD)dnl
+pushdef([CPP], CPP_FOR_BUILD)dnl
+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
+pushdef([host], build)dnl
+pushdef([host_alias], build_alias)dnl
+pushdef([host_cpu], build_cpu)dnl
+pushdef([host_vendor], build_vendor)dnl
+pushdef([host_os], build_os)dnl
+pushdef([ac_cv_host], ac_cv_build)dnl
+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
+pushdef([ac_cpp], ac_build_cpp)dnl
+pushdef([ac_compile], ac_build_compile)dnl
+pushdef([ac_link], ac_build_link)dnl
+
+save_cross_compiling=$cross_compiling
+save_ac_tool_prefix=$ac_tool_prefix
+cross_compiling=no
+ac_tool_prefix=
+
+AC_PROG_CC
+AC_PROG_CPP
+AC_EXEEXT
+
+ac_tool_prefix=$save_ac_tool_prefix
+cross_compiling=$save_cross_compiling
+
+dnl Restore the old definitions
+dnl
+popdef([ac_link])dnl
+popdef([ac_compile])dnl
+popdef([ac_cpp])dnl
+popdef([ac_cv_host_os])dnl
+popdef([ac_cv_host_vendor])dnl
+popdef([ac_cv_host_cpu])dnl
+popdef([ac_cv_host_alias])dnl
+popdef([ac_cv_host])dnl
+popdef([host_os])dnl
+popdef([host_vendor])dnl
+popdef([host_cpu])dnl
+popdef([host_alias])dnl
+popdef([host])dnl
+popdef([LDFLAGS])dnl
+popdef([CPPFLAGS])dnl
+popdef([CFLAGS])dnl
+popdef([CPP])dnl
+popdef([CC])dnl
+popdef([ac_objext])dnl
+popdef([ac_exeext])dnl
+popdef([ac_cv_objext])dnl
+popdef([ac_cv_exeext])dnl
+popdef([ac_cv_prog_cc_g])dnl
+popdef([ac_cv_prog_cc_cross])dnl
+popdef([ac_cv_prog_cc_works])dnl
+popdef([ac_cv_prog_gcc])dnl
+popdef([ac_cv_prog_CPP])dnl
+
+dnl Finally, set Makefile variables
+dnl
+BUILD_EXEEXT=$ac_build_exeext
+BUILD_OBJEXT=$ac_build_objext
+AC_SUBST(BUILD_EXEEXT)dnl
+AC_SUBST(BUILD_OBJEXT)dnl
+AC_SUBST([CFLAGS_FOR_BUILD])dnl
+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
+AC_SUBST([LDFLAGS_FOR_BUILD])dnl
+])
--- a/configure.ac 2019-06-27 23:58:31.045413144 +0800
+++ b/configure.ac 2019-06-28 01:45:36.511771656 +0800
@@ -1,6 +1,8 @@
AC_PREREQ(2.59)
AC_INIT(alsa-firmware, 1.0.29)
+AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
+AC_PROG_CC_FOR_BUILD
AC_PROG_INSTALL
AC_PROG_LN_S
AC_HEADER_STDC
--- a/vxloader/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/vxloader/Makefile.am 2019-06-28 01:55:19.525947146 +0800
@@ -43,5 +43,14 @@
hotplugfw_DATA =
endif
-%.xlx: %.rbt toxlx
- ./toxlx < $< > $@
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+toxlx$(BUILD_EXEEXT): $(toxlx_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+%.xlx: %.rbt toxlx$(BUILD_EXEEXT)
+ ./toxlx$(BUILD_EXEEXT) < $< > $@
--- a/echoaudio/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/echoaudio/Makefile.am 2019-06-28 02:00:00.579426080 +0800
@@ -74,33 +74,42 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer DSP/LoaderDSP.c loader_dsp.fw
- ./fw_writer DSP/Darla20DSP.c darla20_dsp.fw
- ./fw_writer DSP/Gina20DSP.c gina20_dsp.fw
- ./fw_writer DSP/Layla20DSP.c layla20_dsp.fw
- ./fw_writer ASIC/LaylaASIC.c layla20_asic.fw
- ./fw_writer DSP/Darla24DSP.c darla24_dsp.fw
- ./fw_writer DSP/Gina24DSP.c gina24_301_dsp.fw
- ./fw_writer ASIC/Gina24ASIC.c gina24_301_asic.fw
- ./fw_writer DSP/Gina24_361DSP.c gina24_361_dsp.fw
- ./fw_writer ASIC/Gina24ASIC_361.c gina24_361_asic.fw
- ./fw_writer DSP/Layla24DSP.c layla24_dsp.fw
- ./fw_writer ASIC/Layla24_1ASIC.c layla24_1_asic.fw
- ./fw_writer ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw
- ./fw_writer ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw
- ./fw_writer DSP/MonaDSP.c mona_301_dsp.fw
- ./fw_writer ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw
- ./fw_writer ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw
- ./fw_writer DSP/Mona361DSP.c mona_361_dsp.fw
- ./fw_writer ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw
- ./fw_writer ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw
- ./fw_writer ASIC/Mona2ASIC.c mona_2_asic.fw
- ./fw_writer DSP/MiaDSP.c mia_dsp.fw
- ./fw_writer DSP/Echo3gDSP.c echo3g_dsp.fw
- ./fw_writer ASIC/3G_ASIC.c 3g_asic.fw
- ./fw_writer DSP/IndigoDSP.c indigo_dsp.fw
- ./fw_writer DSP/IndigoIODSP.c indigo_io_dsp.fw
- ./fw_writer DSP/IndigoIOxDSP.c indigo_iox_dsp.fw
- ./fw_writer DSP/IndigoDJDSP.c indigo_dj_dsp.fw
- ./fw_writer DSP/IndigoDJxDSP.c indigo_djx_dsp.fw
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT) DSP/LoaderDSP.c loader_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Darla20DSP.c darla20_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Gina20DSP.c gina20_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Layla20DSP.c layla20_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/LaylaASIC.c layla20_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Darla24DSP.c darla24_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24DSP.c gina24_301_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC.c gina24_301_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24_361DSP.c gina24_361_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC_361.c gina24_361_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Layla24DSP.c layla24_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_1ASIC.c layla24_1_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/MonaDSP.c mona_301_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Mona361DSP.c mona_361_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona2ASIC.c mona_2_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/MiaDSP.c mia_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Echo3gDSP.c echo3g_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/3G_ASIC.c 3g_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDSP.c indigo_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIODSP.c indigo_io_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIOxDSP.c indigo_iox_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJDSP.c indigo_dj_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJxDSP.c indigo_djx_dsp.fw
--- a/emu/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/emu/Makefile.am 2019-06-28 02:01:37.856710042 +0800
@@ -22,5 +22,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)
--- a/maestro3/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/maestro3/Makefile.am 2019-06-28 02:03:13.704828106 +0800
@@ -17,5 +17,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)
--- a/sb16/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/sb16/Makefile.am 2019-06-28 02:04:37.121743871 +0800
@@ -18,5 +18,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)
--- a/wavefront/Makefile.am 2019-06-28 02:07:27.003727160 +0800
+++ b/wavefront/Makefile.am 2019-06-28 02:07:46.477947626 +0800
@@ -17,5 +17,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)
--- a/ymfpci/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/ymfpci/Makefile.am 2019-06-28 02:09:02.487797826 +0800
@@ -17,5 +17,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
name = "alsa-firmware-1.2.1";
@ -8,6 +8,13 @@ stdenv.mkDerivation rec {
sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf";
};
patches = [ (fetchpatch {
url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch";
sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78";
}) ];
nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ];
configureFlags = [
"--with-hotplug-dir=$(out)/lib/firmware"
];

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "eventstat";
version = "0.04.08";
version = "0.04.09";
src = fetchzip {
url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
sha256 = "08a2fg2bl7rf29br1mryix5hp2njy0cjl648lnyiv7wngi341qsm";
sha256 = "1b3m58mak62ym2amnmk62c2d6fypk30fw6jsmirh1qz7dwix4bl5";
};
buildInputs = [ ncurses ];
installFlags = [ "DESTDIR=$(out)" ];

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "forkstat";
version = "0.02.13";
version = "0.02.14";
src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz";
sha256 = "01ih89yw9gi6j3l40q5m26la1y0p1jidkxs3yffbdiqm6gwz0xbx";
sha256 = "10kibb5psb5gqdmq9lfb7qw566diwg54gdb49b5zd71qwpybk3dl";
};
installFlags = [ "DESTDIR=$(out)" ];
postInstall = ''

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "fwts";
version = "19.11.00";
version = "20.02.00";
src = fetchzip {
url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
sha256 = "07adim2pxh1d0395632ds78hcy7xs3jqgdijksq10ridivhqxcli";
sha256 = "1mplv4866w3w1vixn7abq9cgh8gxgzhdyxsvj952vkhv3b8in4jq";
stripRoot = false;
};

View file

@ -0,0 +1,31 @@
{ stdenv, libbsd, fetchurl, phpPackages, php }:
stdenv.mkDerivation rec {
version = "4.7.6";
pname = "adminer";
# not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
src = fetchurl {
url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz";
sha256 = "1zgvscz7jk32qga8hp2dg89h7y72v05vz4yh4lq2ahhwwkbnsxpi";
};
nativeBuildInputs = with phpPackages; [ php composer ];
buildPhase = ''
composer --no-cache run compile
'';
installPhase = ''
mkdir $out
cp adminer-${version}.php $out/adminer.php
'';
meta = with stdenv.lib; {
description = "Database management in a single PHP file";
homepage = "https://www.adminer.org";
license = with licenses; [ asl20 gpl2 ];
maintainers = with maintainers; [ sstef ];
platforms = platforms.all;
};
}

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "0.6.7";
version = "0.6.8";
pname = "nix-bash-completions";
src = fetchFromGitHub {
owner = "hedning";
repo = "nix-bash-completions";
rev = "v${version}";
sha256 = "067j1gavpm9zv3vzw9gq0bi3bi0rjrijwprc1j016g44kvpq49qi";
sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc";
};
# To enable lazy loading via. bash-completion we need a symlink to the script
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = https://github.com/hedning/nix-bash-completions;
homepage = "https://github.com/hedning/nix-bash-completions";
description = "Bash completions for Nix, NixOS, and NixOps";
license = licenses.bsd3;
platforms = platforms.all;

View file

@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
version = "2020-03-03";
version = "2020-03-05";
pname = "oh-my-zsh";
rev = "bbe54e4e6009dcbb69a4ace22ddae3672b323fdc";
rev = "2f345a3d0c9a94891c909a9ae6f6e2e2dc6df5b2";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "13znfpr9dvvvasrszdi2qr4iprx1s1z5rx16f01hc6r9jqnbqi5s";
sha256 = "1xs6rz73i04b91ans8j3k46xxb64ljvx7v06j2wmr38lqfplw0ym";
};
pathsToLink = [ "/share/oh-my-zsh" ];

View file

@ -3,14 +3,14 @@
# To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option
stdenv.mkDerivation rec {
version = "0.6.0";
version = "0.7.1";
pname = "zsh-syntax-highlighting";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-syntax-highlighting";
rev = version;
sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
sha256 = "03r6hpb5fy4yaakqm3lbf4xcvd408r44jgpv4lnzl9asp4sb9qc0";
};
buildInputs = [ zsh ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Fish shell like syntax highlighting for Zsh";
homepage = https://github.com/zsh-users/zsh-syntax-highlighting;
homepage = "https://github.com/zsh-users/zsh-syntax-highlighting";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = [ maintainers.loskutov ];

View file

@ -3,13 +3,13 @@
python3Packages.buildPythonApplication rec {
pname = "wpgtk";
version = "6.0.12";
version = "6.0.13";
src = fetchFromGitHub {
owner = "deviantfero";
repo = "wpgtk";
rev = version;
sha256 = "1wqdjq3pjgwb1da549izw3bzi1bk6q7d1hjw3i2zg5nhig1vvxw6";
sha256 = "1fphv6k2hqfi3fzazjqmvip7sz9fhy5ccsgpqv68vfylrf8g1f92";
};
buildInputs = [
@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf.
'';
homepage = https://github.com/deviantfero/wpgtk;
homepage = "https://github.com/deviantfero/wpgtk";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.melkor333 ];

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
version = "0.9.11";
version = "0.9.18";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
sha256 = "0nz06q1rdrqgprclgr30la2vp4bx0qgibh22vdlqpd4rzi3x0h2r";
sha256 = "0bqaj4a56h26sgiw2r453k6f252sy6lrb71ammr0ki3bqqqjhvdi";
};
cargoSha256 = "0hmz19ndfcg7bsrjk89ck9x99ibsvghqwmvgcd89vxmjr5h13rsg";
cargoSha256 = "1rrwmi1wwjjql3chw996wki7mx0biaw9wc4v2xzv3vrxspvlvb5g";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

View file

@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2019.12.09";
version = "2020.02.12";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
sha256 = "1pc7wm4np43ax13k4sfwr12dzyinw9p2ghacdw0rwdljg0k000a2";
sha256 = "1h0ixdbhxdfvii9in9pdidkdv12qfwbhjy3diknywl0yvaa40xw0";
};
# There is also a file called "makefile" which seems to be preferred by the standard build phase
makefile = "Makefile";
meta = with stdenv.lib; {
homepage = http://abc.sourceforge.net/abcMIDI/;
homepage = "http://abc.sourceforge.net/abcMIDI/";
downloadPage = https://ifdo.ca/~seymour/runabc/top.html;
license = licenses.gpl2Plus;
description = "Utilities for converting between abc and MIDI";

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
stdenv.mkDerivation rec {
name = "bacula-9.4.4";
name = "bacula-9.6.2";
src = fetchurl {
url = "mirror://sourceforge/bacula/${name}.tar.gz";
sha256 = "1gi0zkkzh6a87xk4sm051hwz5bv4qc4kbl6hk40752knr817mqqg";
sha256 = "0hw7wvgh7ymyyar5diqjn9kflhcb8a9kjgz6phb0x9r06j8yahaw";
};
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Enterprise ready, Network Backup Tool";
homepage = http://bacula.org/;
homepage = "http://bacula.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ domenkozar lovek323 eleanor ];
platforms = platforms.all;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "0.13.1";
version = "0.13.2";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "13b1w9g68aj3r70w9bmrmdc772y959n77ajbdm2cpjs5f4kgfpak";
sha256 = "0lrrbzs7s2dgifamp81g41fhg6274pvri4hr3xxr1swpvsinxwfn";
};
cargoSha256 = "0zrwpmsrzwnjml0964zky8w222zmlargha3z0n6hf8cfshx23s4k";
cargoSha256 = "1whnisc30f7qsd8xdr25s64sd1qlbcasd0b06f216sxsf6bmf8a1";
nativeBuildInputs = [ installShellFiles ];

View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec{
version = "1.2.1";
version = "1.2.2";
pname = "chafa";
src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
rev = version;
sha256 = "19dck47v4hd07q9742mgb928h7y1y9638qlh2rzsvqsfqvqmxh85";
sha256 = "10in960wzvmb25biifi480dz87c034vwb8mcshclssl7gmzgpzdn";
};
nativeBuildInputs = [ autoconf
@ -37,7 +37,7 @@ stdenv.mkDerivation rec{
meta = with stdenv.lib; {
description = "Terminal graphics for the 21st century.";
homepage = https://hpjansson.org/chafa/;
homepage = "https://hpjansson.org/chafa/";
license = licenses.lgpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.mog ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "1.7.13";
version = "1.7.16";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "1xqmr7sps5s3ib4q91z7drwlglp1av37gb2jm0zw7y3ijyp2c749";
sha256 = "1fkjdpqal0yzm58l146pf5xpbhij9iq79933i9a77v2jihdbjn52";
};
modSha256 = "07fglc3k3a5y70slly4ri3izwnyk4nwghmvkjwgc8lbw8m1zx0r8";
modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8";
buildFlagsArray = [
"-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}"
@ -20,7 +20,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --bash completions/chezmoi-completion.bash
installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash
installShellCompletion --fish completions/chezmoi.fish
installShellCompletion --zsh completions/chezmoi.zsh
'';
@ -28,7 +28,7 @@ buildGoModule rec {
subPackages = [ "." ];
meta = with stdenv.lib; {
homepage = https://github.com/twpayne/chezmoi;
homepage = "https://www.chezmoi.io/";
description = "Manage your dotfiles across multiple machines, securely";
license = licenses.mit;
maintainers = with maintainers; [ jhillyerd ];

View file

@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [
];
in stdenv.mkDerivation rec {
pname = "debootstrap";
version = "1.0.117";
version = "1.0.119";
src = fetchurl {
# git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz";
sha256 = "0rsdw1yjkx35jd1i45646l07glnwsn9gzd6k8sjccv2xvhcljq77";
sha256 = "1q5kw5mm5cnm97j0iz8hfbmjrpdc3n3pcw7f9as1n6h0xp0bmgp6";
};
nativeBuildInputs = [ makeWrapper ];
@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Tool to create a Debian system in a chroot";
homepage = https://wiki.debian.org/Debootstrap;
homepage = "https://wiki.debian.org/Debootstrap";
license = licenses.mit;
maintainers = with maintainers; [ marcweber ];
platforms = platforms.linux;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "graylog";
version = "3.2.1";
version = "3.2.2";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "1pilksik3bbd4sgmnpns9gg9sddybzxzxkn9sknn40dav08k1x6h";
sha256 = "1n9nwxq0aklihhp0v39klq4za63ks6v5z76dp5821jcv1cbk96g9";
};
dontBuild = true;
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Open source log management solution";
homepage = https://www.graylog.org/;
homepage = "https://www.graylog.org/";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = [ maintainers.fadenb ];

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "eternal-terminal";
version = "6.0.6";
version = "6.0.7";
src = fetchFromGitHub {
owner = "MisterTea";
repo = "EternalTerminal";
rev = "et-v${version}";
sha256 = "0vhhiccyvp9pjdmmscwdwcynxfwd2kgv418z90blnir0yfkvsryq";
sha256 = "03pdspggqxkmz95qb96pig5x0xw18hy9a7ivszydr32ry6kxxx1h";
};
nativeBuildInputs = [ cmake ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Remote shell that automatically reconnects without interrupting the session";
license = licenses.asl20;
homepage = https://mistertea.github.io/EternalTerminal/;
homepage = "https://mistertea.github.io/EternalTerminal/";
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ dezgeg pingiun ];
};

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
sha256 = "1mg0awsf8z5sd7s7vj5rs18my3aksxsggb5y85kaf0skq79ybmrx";
sha256 = "0c6jjr1343lqwggvpxdhbjyi1far4f7f3yzq1y0nj1j952j7a36x";
};
cargoSha256 = "0mnp2hl9q6qsfj4x37ss9gfhss184lzs63zv327l6jnd2m1yq8b2";
cargoSha256 = "1cyfxfhbc2xhavnkhva1xdcw8vy9i5pqhfbiwn6idpfy6hm1w0bx";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optional stdenv.isDarwin Security;

View file

@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
version = "2.1.2";
version = "2.1.3";
src = fetchurl {
url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
sha256 = "0xqb64nyl7hqnzpqb2jhv1ash47fcf4sspl3lalybb85i65b0yb0";
sha256 = "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv";
};
buildInputs = [ openssl zlib ]

View file

@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "nixpkgs-fmt";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
sha256 = "1iylldgyvrcarfigpbhicg6j6qyipfiqn7gybza7qajfzyprjqfa";
sha256 = "0b9wwv77bpq24yxky44ndgvxsx2zgsl15lvl6wklbkr41mwz3xis";
};
cargoSha256 = "1jxvy4w9jxv898wgqyj9bpkhnc7pkj9dxg5x0b39xsnkzl2lr239";
cargoSha256 = "1vv2gypbmgd9lksrk5h2z3agcs1269p1i3im9529nhcsl62ckj7n";
meta = with lib; {
description = "Nix code formatter for nixpkgs";

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
version = "0.2.10";
version = "0.2.12";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
sha256 = "1y77cla6bgy8pjb21cawx7cb69hhri4r7gyjkhnjyiixkh945mwj";
sha256 = "1jhv7c68ymwaq9fr586rjbgcaxpkxcr0d3pq7lyhbzihaywz7m6m";
};
cargoSha256 = "1vkcr239axxqya0iin74jxkmx6z9nwb67pjjdh89v4qwjvwhiqg3";
cargoSha256 = "1n4k8mnsix3sy6pmqkk7wymknn1mn5dkwa9i90nlb4k2h9y709wj";
meta = with lib; {
description = "Mirror installed software on multiple machines";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault";
version = "2.12.0c";
version = "2.12.0e";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
sha256 = "040bqbx6hpwq4qvv4s7d77gwp5n2ay9rr7kdb135582d80wjq5sp";
sha256 = "1jy3c5ywlplrjsy37i90x5s8k0i5n1mn8y0fyl074s807glqaxbf";
};
buildCommand = ''

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "stress-ng";
version = "0.10.19";
version = "0.11.01";
src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
sha256 = "0v85q5sch1rx68cr69s1wrr79ny9gv99awgqkailk76z2cjva38g";
sha256 = "152lyqv7g6jl4xsvg639n6y8h6v2qag3afxynaws38bsr149bqcz";
};
postPatch = ''

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FanFicFare";
version = "3.15.0";
version = "3.16.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "12nsrl8nvg52mi136m7ayvaivwjapn7ry95137ynj1njy2w990hm";
sha256 = "1l76fh23a9wmw47bahd5l1bxyqcy54lahvid373iy9p3586fskis";
};
propagatedBuildInputs = with python3Packages; [
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
meta = with stdenv.lib; {
description = "Tool for making eBooks from fanfiction web sites";
homepage = https://github.com/JimmXinu/FanFicFare;
homepage = "https://github.com/JimmXinu/FanFicFare";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ dwarfmaster ];

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }:
stdenv.mkDerivation rec {
version = "5.7.0";
version = "5.8.0";
pname = "link-grammar";
outputs = [ "bin" "out" "dev" "man" ];
src = fetchurl {
url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "0ak1v469k56v3511kxxkxvx1nw6zcxcl0f1kcvc82ffacqbr4y96";
sha256 = "1v8ngx77nachxln68xpvyw2lh7z59pzsi99h8j0mnrm0gjsacrdd";
};
nativeBuildInputs = [ pkgconfig python3 ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A Grammar Checking library";
homepage = https://www.abisource.com/projects/link-grammar/;
homepage = "https://www.abisource.com/projects/link-grammar/";
license = licenses.lgpl21;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;

Some files were not shown because too many files have changed in this diff Show more