aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/misc
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/misc')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/misc/h3/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/misc/or1k/newlib.nix36
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/misc/yelp-tools/default.nix4
5 files changed, 43 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix b/infra/libkookie/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix
index a527491777bc..be260edb643a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/misc/google-clasp/google-clasp.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/misc/h3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/misc/h3/default.nix
index 32f65c0925c3..8b8515261a1c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/misc/h3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/misc/h3/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "h3";
- version = "3.6.4";
+ version = "3.7.1";
src = fetchFromGitHub {
owner = "uber";
repo = "h3";
rev = "v${version}";
- sha256 = "1a4scs5n9srq6sjkz8d60ffzpc6aadkxmk1i3hdj081j0jzsrpf7";
+ sha256 = "1ccyzbvbacf0bl9av4yp15zmhiqr3679nnbab11yrhxm9csyal16";
};
nativeBuildInputs = [ cmake ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/infra/libkookie/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
index 0bd68afae4b8..055459514e44 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
@@ -70,4 +70,6 @@ mkDerivation {
description = "GraphQL API over Postgres";
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ offline ];
+ hydraPlatforms = [];
+ broken = true;
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/misc/or1k/newlib.nix b/infra/libkookie/nixpkgs/pkgs/development/misc/or1k/newlib.nix
new file mode 100644
index 000000000000..92829896a27c
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/misc/or1k/newlib.nix
@@ -0,0 +1,36 @@
+{ stdenv, texinfo, flex, bison, fetchFromGitHub, crossLibcStdenv, buildPackages }:
+
+crossLibcStdenv.mkDerivation {
+ name = "newlib";
+ src = fetchFromGitHub {
+ owner = "openrisc";
+ repo = "newlib";
+ rev = "8ac94ca7bbe4ceddafe6583ee4766d3c15b18ac8";
+ sha256 = "0hzhijmry5slpp6x12pgng8v7jil3mn18ahrhnw431lqrs1cma0s";
+ };
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+ # newlib expects CC to build for build platform, not host platform
+ preConfigure = ''
+ export CC=cc
+ '';
+
+ configurePlatforms = [ "build" "target" ];
+ configureFlags = [
+ "--host=${stdenv.buildPlatform.config}"
+
+ "--disable-newlib-supplied-syscalls"
+ "--disable-nls"
+ "--enable-newlib-io-long-long"
+ "--enable-newlib-register-fini"
+ "--enable-newlib-retargetable-locking"
+ ];
+
+ dontDisableStatic = true;
+
+ passthru = {
+ incdir = "/${stdenv.targetPlatform.config}/include";
+ libdir = "/${stdenv.targetPlatform.config}/lib";
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/misc/yelp-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/misc/yelp-tools/default.nix
index 7714ef046b7b..19e345b3c2fd 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/misc/yelp-tools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/misc/yelp-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yelp-tools";
- version = "3.32.2";
+ version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q";
+ sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30";
};
passthru = {