diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result diff --git a/default.nix b/default.nix index 69d76ad..255a5f9 100644 --- a/default.nix +++ b/default.nix @@ -1,30 +1,36 @@ -{ stdenv, bundlerEnv, ruby, callPackage, perl, defaultGemConfig +{ stdenv +, bundlerEnv +, ruby +, callPackage +, perl +, defaultGemConfig , pname ? "diaspora" , version ? import ./version.nix }: stdenv.mkDerivation rec { - inherit pname version; + + inherit pname version; - src = callPackage ./source.nix {}; + src = callPackage ./source.nix {}; - diasporaGems = bundlerEnv { - name = "${pname}-gems-${version}"; - version = version; - ruby = ruby; - gemconfig = defaultGemConfig // { - kostya-sigar = attrs: { - buildInputs = [ perl ]; + diasporaGems = bundlerEnv { + inherit version ruby; + name = "${pname}-gems-${version}"; + gemconfig = defaultGemConfig // { + kostya-sigar = attrs: { + buildInputs = [ perl ]; + }; + }; + gemdir = src; + gemset = ./gemset.nix; }; - }; - gemdir = src; - gemset = ./gemset.nix; - }; - name = "diaspora"; - buildInputs = [diasporaGems ruby]; - installPhase = '' + name = "diaspora"; + buildInputs = [ diasporaGems ruby ]; + nativeBuildInputs = [ diasporaGems ]; + installPhase = '' mkdir -p $out/{bin,share/diaspora} cp -r * $out/share/diaspora bin=$out/bin/diaspora diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..ce1e8d7 --- /dev/null +++ b/flake.lock @@ -0,0 +1,58 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1690327932, + "narHash": "sha256-Fv7PYZxN4eo0K6zXhHG/vOc+e2iuqQ5ywDrh0yeRjP0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a9b47d85504bdd199e90846622c76aa0bfeabfac", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..30c448b --- /dev/null +++ b/flake.nix @@ -0,0 +1,9 @@ +{ + description = "Ricochet"; + + outputs = { self, nixpkgs, flake-utils }: + let pkgs = nixpkgs.legacyPackages.x86_64-linux; in + { + packages.x86_64-linux.default = pkgs.callPackage ./default.nix {}; + }; +} diff --git a/gemset.nix b/gemset.nix index 907c799..7dcbd46 100644 --- a/gemset.nix +++ b/gemset.nix @@ -860,15 +860,15 @@ version = "2.8.1"; }; eye = { - dependencies = ["celluloid" "celluloid-io" "state_machines" "thor"]; + dependencies = ["celluloid" "celluloid-io" "kostya-sigar" "state_machines" "thor"]; groups = ["production"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpdpzxbcc0cmdypw7zxf2jg8ggpff7dw9mr0x79mams7qhg6nd7"; + sha256 = "0gqrrrisy492m6sczq775dyg9sxkl926r8lkr6z33kfb4cnimfzk"; type = "gem"; }; - version = "0.9.4.nosigar"; + version = "0.10.0"; }; fabrication = { groups = ["default" "test"]; @@ -1395,6 +1395,16 @@ }; version = "2.7.1"; }; + kostya-sigar = { + groups = ["default" "production"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mxkj8f2fi79h0ccdjw38jh82psh0ql0i10y2j7s7dn0fkcb8lh3"; + type = "gem"; + }; + version = "2.0.10"; + }; language_server-protocol = { groups = ["default" "development"]; platforms = []; @@ -2749,10 +2759,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k17pcw8ppps3h0x2vzsynzcpind235147x3j3bc2961b5p8zq08"; + sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; type = "gem"; }; - version = "0.6.0"; + version = "0.5.0"; }; string-direction = { groups = ["default"]; diff --git a/generate.sh b/generate.sh new file mode 100755 index 0000000..ba6a140 --- /dev/null +++ b/generate.sh @@ -0,0 +1,4 @@ +curl https://api.github.com/repos/diaspora/diaspora/commits/master | \ + jq '.commit.author.date' -r | \ # extracts the datetime w/o quotes + sed -e 's/\(.*\)T.*Z/"\1"/' > \ # removes time and adds quotes + version.nix diff --git a/version.nix b/version.nix index 80386d0..1a62918 100644 --- a/version.nix +++ b/version.nix @@ -1 +1 @@ -"unstable-2023-07-09" +"2023-07-09"