Merge branch 'master' into staging-next
This commit is contained in:
Raphael Megzari
GitHub
commit
ed412c297c
7 changed files with 13 additions and 78 deletions
|
|
@ -27,10 +27,10 @@ in {
|
|||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
desktopName = "Discord Canary";
|
||||
version = "0.0.128";
|
||||
version = "0.0.129";
|
||||
src = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
sha256 = "sha256-cw0YBMlapk4QLKiU8ErzzyDaPIXkosUSu7ycRV8VraM=";
|
||||
sha256 = "sha256:1x49vvd363w9xyrzjgmynj2b320hzpz388fh5vpp0q0qk8q3gwkk";
|
||||
};
|
||||
};
|
||||
}.${branch}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
|
||||
sha256 = "1d8c58s2fwdmjjpna57gk0d2ar17f2fqcrkgsn45x6s3ickf984p";
|
||||
sha256 = "1c9zrddmjxvvacismld6fbwbw9vrdbq6g6d3424p8w5p6xg5wlwy";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "0ad";
|
||||
version = "0.0.25";
|
||||
version = "0.0.25b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
|
||||
sha256 = "03s38pknggsbzkhgj692yd3vm16ass7k4bgjn63qwn51q4vsnbjr";
|
||||
sha256 = "1p9fa8f7sjb9c5wl3mawzyfqvgr614kdkhrj2k4db9vkyisws3fp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python2 perl pkg-config ];
|
||||
|
|
|
|||
|
|
@ -40,17 +40,17 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "materialize";
|
||||
version = "0.8.1";
|
||||
rev = "ef996c54db7c9504690b9f230a4a676ae1fb617f";
|
||||
version = "0.8.3";
|
||||
rev = "3e47d280945f0ddbdc263fc643f067649f66eda1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaterializeInc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1lrv0q191rhdqk316557qk2a6b00vrf07j1g63ri6mp8ad1g8gk3";
|
||||
sha256 = "15635hcw04nms133k9l5582xbk7frc86nka91yaafl63q6pwbdvg";
|
||||
};
|
||||
|
||||
cargoSha256 = "0fx7m1ci4zak7sm71kdiaj2l29rlqax15hd424i9yn4aj1bd358b";
|
||||
cargoSha256 = "1fxqjhjs4bqq6nzax7xrhwjpv57dk90iw9fl8ilp41wzg7yvyhcm";
|
||||
|
||||
nativeBuildInputs = [ cmake perl pkg-config ]
|
||||
# Provides the mig command used by the krb5-src build script
|
||||
|
|
@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://materialize.com";
|
||||
description = "A streaming SQL materialized view engine for real-time applications";
|
||||
license = licenses.bsl11;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
maintainers = [ maintainers.petrosagg ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inetutils";
|
||||
version = "2.0";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/inetutils/inetutils-${version}.tar.xz";
|
||||
sha256 = "sha256-5XPVZuVTk5QAmYYuf4mUFkoO0S9ahsM0U4CEK9wSRyI=";
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-1Uf2kXLfc6/vaRoPeIYoD9eBrOoo3vT/S0shIIaonYA";
|
||||
};
|
||||
|
||||
outputs = ["out" "apparmor"];
|
||||
|
|
@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
# https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
|
||||
./inetutils-1_9-PATH_PROCNET_DEV.patch
|
||||
./whois-Update-ORG-TLD-server.patch
|
||||
./whois-Update-Indian-TLD-server.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ help2man perl /* for `whois' */ ];
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
From 1d64e6ae8fa1ef685f3f54c070eb47e7a45895eb Mon Sep 17 00:00:00 2001
|
||||
From: Ashish SHUKLA <ashish.is@lostca.se>
|
||||
Date: Sun, 25 Apr 2021 08:17:52 +0530
|
||||
Subject: [PATCH] whois: Update whois server for .IN
|
||||
|
||||
---
|
||||
whois/tld_serv_list | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
|
||||
index d9257f36..41083c18 100644
|
||||
--- a/whois/tld_serv_list
|
||||
+++ b/whois/tld_serv_list
|
||||
@@ -151,7 +151,7 @@
|
||||
.ie whois.domainregistry.ie
|
||||
.il whois.isoc.org.il
|
||||
.im whois.nic.im
|
||||
-.in whois.inregistry.net
|
||||
+.in whois.registry.in
|
||||
.io whois.nic.io
|
||||
#.iq # NIC?
|
||||
.ir whois.nic.ir
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From a7a517ca23682b160a2a3be47f1f3f262f8f306f Mon Sep 17 00:00:00 2001
|
||||
From: Ashish SHUKLA <ashish.is@lostca.se>
|
||||
Date: Sun, 25 Apr 2021 08:07:52 +0530
|
||||
Subject: [PATCH 1/2] whois: .ORG is not handled by InterNIC anymore
|
||||
|
||||
See https://www.iana.org/domains/root/db/org.html
|
||||
---
|
||||
whois/data.h | 1 -
|
||||
whois/tld_serv_list | 1 +
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/whois/data.h b/whois/data.h
|
||||
index d1eb10ad..82e22b6f 100644
|
||||
--- a/whois/data.h
|
||||
+++ b/whois/data.h
|
||||
@@ -68,7 +68,6 @@ const char *rwhois_servers[] = {
|
||||
const char *gtlds[] = {
|
||||
".com",
|
||||
".net",
|
||||
- ".org",
|
||||
".edu",
|
||||
NULL
|
||||
};
|
||||
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
|
||||
index ad7b9826..d9257f36 100644
|
||||
--- a/whois/tld_serv_list
|
||||
+++ b/whois/tld_serv_list
|
||||
@@ -219,6 +219,7 @@
|
||||
.nu whois.nic.nu
|
||||
.nz whois.srs.net.nz
|
||||
#.om NONE # NIC? http://www.gto.net.om
|
||||
+.org whois.pir.org
|
||||
.pa WEB http://www.nic.pa
|
||||
#.pe whois.rcp.net.pe # kero.yachay.pe valid 2011-03-10
|
||||
.pe kero.yachay.pe
|
||||
--
|
||||
2.31.1
|
||||
|
||||
Loading…
Reference in a new issue