Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

go: 1.12.5->1.12.6, 1.11.10->1.11.11 #63035

Merged
merged 17 commits into from Jun 12, 2019
Merged

go: 1.12.5->1.12.6, 1.11.10->1.11.11 #63035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f93d637
php: fix zts options
Izorkin Jun 6, 2019
4755811
nixos-generate-config: add support for bcache
bjornfor Jun 10, 2019
4df1e91
octopus: 8.4 -> 9.0
markuskowa Jun 11, 2019
925f803
phpPackages: build phpPackages with re2c
Izorkin Jun 6, 2019
a6a26c1
php: update build config
Izorkin Jun 6, 2019
59c4b84
phpPackages.event: 2.5.1 -> 2.5.2
Izorkin Jun 6, 2019
d613239
phpPackages.composer: 1.8.5 -> 1.8.6
Izorkin Jun 11, 2019
813799a
xorg.xcalc: 1.0.7 -> 1.1.0
dtzWill Jun 11, 2019
b647471
browsh: 1.5.0 -> 1.5.2
dtzWill Jun 11, 2019
3f00ca9
Merge pull request #63018 from dtzWill/update/xclock-1.1.0
teto Jun 12, 2019
6845a83
bitlbee-discord: set BITLBEE_DATADIR
jb55 Jun 11, 2019
14ebdbb
bitlebee-discord: add myself as maintainer
jb55 Jun 11, 2019
ca09991
Merge pull request #62976 from markuskowa/upd-octopus
markuskowa Jun 12, 2019
734b3e7
Merge pull request #62966 from bjornfor/nixos-generate-config-bcache
edolstra Jun 12, 2019
039983b
Merge pull request #62783 from Izorkin/php-packages
etu Jun 12, 2019
c14e018
go: 1.12.5 -> 1.12.6
Jun 12, 2019
fb657d7
go: 1.11.10 -> 1.11.11
Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions nixos/modules/installer/tools/nixos-generate-config.pl
View file
Open in desktop
Expand Up @@ -258,6 +258,11 @@ sub usbCheck {
}
}

# Add bcache module, if needed.
my @bcacheDevices = glob("/dev/bcache*");
if (scalar @bcacheDevices > 0) {
push @initrdAvailableKernelModules, "bcache";
}

my $virt = `systemd-detect-virt`;
chomp $virt;
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/browsh/default.nix
View file
Open in desktop
@@ -1,14 +1,14 @@
{ stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:

let
version = "1.5.0";
version = "1.5.2";

# TODO: must build the extension instead of downloading it. But since it's
# literally an asset that is indifferent regardless of the platform, this
# might be just enough.
webext = fetchurl {
url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi";
sha256 = "063m6rcdyf2zcrswkm56k8h3w15124bw5iykklzm60q5jk4ywn3f";
sha256 = "0b9aycyif0hfhfkivlnvinr13r9h4qyxx768286966p67napbd63";
};

in buildGoPackage rec {
Expand All @@ -23,7 +23,7 @@ in buildGoPackage rec {
owner = "browsh-org";
repo = "browsh";
rev = "v${version}";
sha256 = "14addyb1zdk1b9mizfxdagyzlkd9nf5gawnbrs44j5a3ggnl14ln";
sha256 = "1z78kgxrbi2jy20rbq6kx5mjk4gpg58w4rb3flp42l9p7bhdbr2h";
};

buildInputs = [ go-bindata ];
Expand Down
139 changes: 65 additions & 74 deletions pkgs/applications/networking/browsers/browsh/deps.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ stdenv.mkDerivation rec {

preConfigure = ''
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
export BITLBEE_DATADIR=$out/share/bitlbee
./autogen.sh
'';

Expand All @@ -25,7 +26,7 @@ stdenv.mkDerivation rec {

homepage = https://github.com/sm00th/bitlbee-discord;
license = licenses.gpl2Plus;
maintainers = [ maintainers.lassulus ];
maintainers = with maintainers; [ lassulus jb55 ];
platforms = stdenv.lib.platforms.linux;
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/science/chemistry/octopus/default.nix
View file
Open in desktop
Expand Up @@ -3,15 +3,15 @@
}:

let
version = "8.4";
version = "9.0";
fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };

in stdenv.mkDerivation {
name = "octopus-${version}";

src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
sha256 = "1fx5ssnf65b9ld7xs9rvvg8i80pblxpyhqkir0a7xshkk1g60z55";
sha256 = "0p1gjykjnzm4m93mgjsmnxd0n2j381jk5kn3a7gkzxanixp60ilm";
};

nativeBuildInputs = [ perl procps fftw.dev ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/build-support/build-pecl.nix
View file
Open in desktop
@@ -1,4 +1,4 @@
{ stdenv, php, autoreconfHook, fetchurl }:
{ stdenv, php, autoreconfHook, fetchurl, re2c }:

{ pname
, version
Expand All @@ -17,7 +17,7 @@ stdenv.mkDerivation (args // {

inherit src;

nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs;
nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs;
buildInputs = [ php ] ++ buildInputs;

makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/go/1.11.nix
View file
Open in desktop
Expand Up @@ -30,11 +30,11 @@ in

stdenv.mkDerivation rec {
pname = "go";
version = "1.11.10";
version = "1.11.11";

src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "06rw962xigbrxblp942jbh7k133blpxg2xfrxi32qdhxkmmfj9yz";
sha256 = "130g5lhg4h5xwa6chvxfi80nvdx8qb26xfbamzgyc8i5xwrprzqz";
};

# perl is used for testing go vet
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/go/1.12.nix
View file
Open in desktop
Expand Up @@ -30,11 +30,11 @@ in

stdenv.mkDerivation rec {
pname = "go";
version = "1.12.5";
version = "1.12.6";

src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "1s034pr60h20lsw171vbzqxqvcqn0s04dxfyqczyfcmkrf4g199a";
sha256 = "1jmlj8pygg4hjpkziicihcf76lz61w1qljdpm3hqlqsmfk65qv69";
};

# perl is used for testing go vet
Expand Down