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.

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

Rename iql to gensql #7

Merged
merged 1 commit into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
- run: |
nix build \
-L \
-o ./imgIqlQuery \
'.#ociImgIqlQuery'
-o ./imgGensqlQuery \
'.#ociImgGensqlQuery'
- if: github.ref == 'refs/heads/main'
run: |
docker load -i ./imgIqlQuery
docker push --all-tags probcomp/inferenceql.query
docker load -i ./imgGensqlQuery
docker push --all-tags probcomp/gensql.query
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# InferenceQL/nix
# OpenGen/nix

This repo holds Nix flake, modules, packages, and reusable utility Nix language code for use across the InferenceQL ecosystem.
This repo holds Nix flake, modules, packages, and reusable utility Nix language code for use across the OpenGen ecosystem.

## Usage

Expand All @@ -9,7 +9,7 @@ This repo holds Nix flake, modules, packages, and reusable utility Nix language
Currently, you can build a package directly like so:

```bash
nix build github.com:InferenceQL/nix#ociImgBase
nix build github.com:OpenGen/nix#ociImgBase
```

### Import utility code
Expand All @@ -20,11 +20,11 @@ To access the `lib` code exported by this flake, declare this repo as a flake in
{
inputs = {
nixpkgs.url = ...
iqlnix.url = "github:InferenceQL/nix";
gensqlnix.url = "github:OpenGen/nix";
};
outputs = inputs@{ nixpkgs, iqlnix , ... }: let
outputs = inputs@{ nixpkgs, gensqlnix, ... }: let
# call some function
toolbox = iqlnix.lib.basicTools "aarch64-darwin";
toolbox = gensqlnix.lib.basicTools "aarch64-darwin";
in {
...
};
Expand Down
64 changes: 32 additions & 32 deletions flake.lock

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

10 changes: 5 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
description = "Nix utilities and cross-repo build artifacts for inferenceql";
description = "Nix utilities and cross-repo build artifacts for OpenGen";

inputs = {
flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
iqlquery.url = "github:inferenceql/inferenceql.query";
gensqlquery.url = "github:OpenGen/GenSQL.query";
};

outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
Expand All @@ -29,9 +29,9 @@
inherit nixpkgs;
basicTools = self.lib.basicTools;
};
ociImgIqlQuery = pkgs.callPackage ./pkgs/oci/inferenceql.query {
ociImgGensqlQuery = pkgs.callPackage ./pkgs/oci/gensql.query {
inherit nixpkgs ociImgBase;
iqlquery = inputs.iqlquery;
gensqlquery = inputs.gensqlquery;
};

toolkit = self.lib.basicTools pkgs;
Expand All @@ -51,7 +51,7 @@
packages = {
inherit
ociImgBase
ociImgIqlQuery
ociImgGensqlQuery
;

goftests = callPackage ./pkgs/goftests { };
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{ pkgs,
nixpkgs,
system,
iqlquery,
gensqlquery,
ociImgBase,
}: let
# in OCI context, whatever our host platform we want to build same arch but linux
systemWithLinux = builtins.replaceStrings [ "darwin" ] [ "linux" ] system;
crossPkgsLinux = nixpkgs.legacyPackages.${systemWithLinux};

ociBin = iqlquery.packages.${systemWithLinux}.bin;
ociBin = gensqlquery.packages.${systemWithLinux}.bin;
in pkgs.dockerTools.buildImage {
name = "probcomp/inferenceql.query";
name = "probcomp/gensql.query";
tag = systemWithLinux;
fromImage = ociImgBase;
copyToRoot = [ ociBin ];
config = {
Cmd = [ "${ociBin}/bin/iql" ];
Cmd = [ "${ociBin}/bin/gensql" ];
};
}
Loading