public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oq: 1.1.0 -> 1.2.0

Browse Source
This commit is contained in:
Peter Hoeg 2021-03-30 15:25:26 +08:00
parent 34b5e46f73
commit a176af3dce
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/icr/default.nix
View File

@ -13,13 +13,13 @@
crystal.buildCrystalPackage rec { crystal.buildCrystalPackage rec {
pname = "icr"; pname = "icr";
version = "unstable-2020-10-06"; version = "unstable-2021-03-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crystal-community"; owner = "crystal-community";
repo = "icr"; repo = "icr";
rev = "8c57cd7c1fdf8088cb05c1587bd6c40d244a8a80"; rev = "b6b335f40aff4c2c07d21250949935e8259f7d1b";
sha256 = "sha256-b0w6oG2npNgdi2ZowMlJy0iUxQWqb9+DiruQl7Ztb0E="; sha256 = "sha256-Qoy37lCdHFnMAuuqyB9uT15/RLllksFyApYAGy+RmDs=";
}; };
shardsFile = ./shards.nix; shardsFile = ./shards.nix;

29
pkgs/development/tools/oq/default.nix
View File

@ -1,35 +1,26 @@
{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper, fetchpatch }: { lib
, fetchFromGitHub
, crystal
, jq
, libxml2
, makeWrapper
}:
crystal.buildCrystalPackage rec { crystal.buildCrystalPackage rec {
pname = "oq"; pname = "oq";
version = "1.1.0"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Blacksmoke16"; owner = "Blacksmoke16";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1zg4kxpfi3sap4cwp42zg46j5dv0nf926qdqm7k22ncm6jdrgpgw"; sha256 = "sha256-vMW+N3N6H8S6dNm4eBJo2tSxSiouG92t4Nq3cYSWcw0=";
}; };
patches = [
(fetchpatch {
# remove once we have upgraded to oq 1.1.2+
name = "yaml-test-leniency.patch";
url = "https://github.com/Blacksmoke16/oq/commit/93ed2fe50c9ce3fd8d35427e007790ddaaafce60.patch";
sha256 = "1iyz0c0w0ykz268bkrlqwvh1jnnrja0mqip6y89sbpa14lp0l37n";
})
];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jq libxml2 ]; buildInputs = [ jq libxml2 ];
format = "crystal"; format = "shards";
crystalBinaries.oq.src = "src/oq_cli.cr";
preCheck = ''
mkdir bin
cp oq bin/oq
'';
postInstall = '' postInstall = ''
wrapProgram "$out/bin/oq" \ wrapProgram "$out/bin/oq" \