From da27e90abf860021e12a2e7c71e5f7d26a54e13a Mon Sep 17 00:00:00 2001 From: Anurag Ohri Date: Thu, 1 Dec 2022 17:45:27 +0530 Subject: [PATCH 1/6] Webhooks --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 36a662c..b6d492f 100644 --- a/README.md +++ b/README.md @@ -30,3 +30,5 @@ test App testing Webhook testing + +Update PR From b8736f630a64d69046b0b78df9f67b06f5d02b2f Mon Sep 17 00:00:00 2001 From: Anurag Ohri Date: Thu, 1 Dec 2022 18:05:38 +0530 Subject: [PATCH 2/6] Prod Test --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b6d492f..be3fc30 100644 --- a/README.md +++ b/README.md @@ -32,3 +32,5 @@ App testing Webhook testing Update PR + +Test on Prod From d533a37118e123925bbdef690913caff0d932092 Mon Sep 17 00:00:00 2001 From: Anurag Ohri Date: Tue, 6 Dec 2022 11:39:43 +0530 Subject: [PATCH 3/6] Test --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index be3fc30..0096e65 100644 --- a/README.md +++ b/README.md @@ -34,3 +34,5 @@ Webhook testing Update PR Test on Prod + +Merge job updates From 3b8c224c698e88011ab25f6f11fc1e67fdc71d30 Mon Sep 17 00:00:00 2001 From: Anurag Ohri Date: Tue, 20 Dec 2022 17:52:53 +0530 Subject: [PATCH 4/6] Commit update Merge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0096e65..aae4b5b 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,5 @@ Update PR Test on Prod Merge job updates + +Commit Status Update Merge \ No newline at end of file From 344bdb72870a502bb53478a4e5bbc29b5943f026 Mon Sep 17 00:00:00 2001 From: Anurag Ohri Date: Tue, 27 Dec 2022 16:37:03 +0530 Subject: [PATCH 5/6] Test --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9a04ed7..211e0cb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ # smithy-test + +Hello hello my friends + Will be used to setup Smithy locally try and try again From 2e49369c4212dbd0d75a90a783b62dbbca118cac Mon Sep 17 00:00:00 2001 From: Anurag Ohri Date: Tue, 3 Jan 2023 12:55:30 +0530 Subject: [PATCH 6/6] Added a private dep --- dep/nix-thunk/default.nix | 2 ++ dep/nix-thunk/github.json | 7 +++++++ dep/nix-thunk/thunk.nix | 12 ++++++++++++ dep/smithy-test-private-gitea/default.nix | 2 ++ dep/smithy-test-private-gitea/git.json | 8 ++++++++ dep/smithy-test-private-gitea/thunk.nix | 17 +++++++++++++++++ release.nix | 6 +++++- 7 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 dep/nix-thunk/default.nix create mode 100644 dep/nix-thunk/github.json create mode 100644 dep/nix-thunk/thunk.nix create mode 100644 dep/smithy-test-private-gitea/default.nix create mode 100644 dep/smithy-test-private-gitea/git.json create mode 100644 dep/smithy-test-private-gitea/thunk.nix diff --git a/dep/nix-thunk/default.nix b/dep/nix-thunk/default.nix new file mode 100644 index 0000000..2b4d4ab --- /dev/null +++ b/dep/nix-thunk/default.nix @@ -0,0 +1,2 @@ +# DO NOT HAND-EDIT THIS FILE +import (import ./thunk.nix) \ No newline at end of file diff --git a/dep/nix-thunk/github.json b/dep/nix-thunk/github.json new file mode 100644 index 0000000..0c817c5 --- /dev/null +++ b/dep/nix-thunk/github.json @@ -0,0 +1,7 @@ +{ + "owner": "obsidiansystems", + "repo": "nix-thunk", + "private": false, + "rev": "bd0de53129ca4ac5ce313a3e021edf3638a3a22c", + "sha256": "0cn74ylcfr9v2w94jpga9v18jn6zafb9k996afszn59iqlcfi74q" +} diff --git a/dep/nix-thunk/thunk.nix b/dep/nix-thunk/thunk.nix new file mode 100644 index 0000000..20f2d28 --- /dev/null +++ b/dep/nix-thunk/thunk.nix @@ -0,0 +1,12 @@ +# DO NOT HAND-EDIT THIS FILE +let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: + if !fetchSubmodules && !private then builtins.fetchTarball { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; + } else (import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; + sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; +}) {}).fetchFromGitHub { + inherit owner repo rev sha256 fetchSubmodules private; + }; + json = builtins.fromJSON (builtins.readFile ./github.json); +in fetch json \ No newline at end of file diff --git a/dep/smithy-test-private-gitea/default.nix b/dep/smithy-test-private-gitea/default.nix new file mode 100644 index 0000000..2b4d4ab --- /dev/null +++ b/dep/smithy-test-private-gitea/default.nix @@ -0,0 +1,2 @@ +# DO NOT HAND-EDIT THIS FILE +import (import ./thunk.nix) \ No newline at end of file diff --git a/dep/smithy-test-private-gitea/git.json b/dep/smithy-test-private-gitea/git.json new file mode 100644 index 0000000..4b48b27 --- /dev/null +++ b/dep/smithy-test-private-gitea/git.json @@ -0,0 +1,8 @@ +{ + "url": "https://code.obsidian.systems/anuragohri92/smithy-test-private-gitea.git", + "rev": "7155fa4e0058de07d52f43e1c355bd3ca171535a", + "sha256": "1s3yyrcy0pdxk6qzbxgj573nw5g3mhgkfzwy3ap1a5lpjlknf5cc", + "private": true, + "fetchSubmodules": false, + "branch": "main" +} diff --git a/dep/smithy-test-private-gitea/thunk.nix b/dep/smithy-test-private-gitea/thunk.nix new file mode 100644 index 0000000..3e23b43 --- /dev/null +++ b/dep/smithy-test-private-gitea/thunk.nix @@ -0,0 +1,17 @@ +# DO NOT HAND-EDIT THIS FILE +let fetch = {url, rev, branch ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}: + let realUrl = let firstChar = builtins.substring 0 1 url; in + if firstChar == "/" then /. + url + else if firstChar == "." then ./. + url + else url; + in if !fetchSubmodules && private then builtins.fetchGit { + url = realUrl; inherit rev; + ${if branch == null then null else "ref"} = branch; + } else (import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz"; + sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr"; +}) {}).fetchgit { + url = realUrl; inherit rev sha256; + }; + json = builtins.fromJSON (builtins.readFile ./git.json); +in fetch json \ No newline at end of file diff --git a/release.nix b/release.nix index 3200195..c318b0b 100644 --- a/release.nix +++ b/release.nix @@ -1,8 +1,12 @@ with (import {}); -derivation { +let + nt = import ./dep/nix-thunk {}; + pvt = import (nt.thunkSource ./dep/smithy-test-private-gitea); +in derivation { inherit gcc coreutils; name = "myhello-0.0.1"; builder = "${bash}/bin/bash"; + buildInputs = [ pvt ]; args = [ ./builder.sh ]; system = "x86_64-linux"; src = ./hello.c;