[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: gnu: red-eclipse: Use GIT-FETCH for data sources.
|
From: |
guix-commits |
|
Subject: |
05/05: gnu: red-eclipse: Use GIT-FETCH for data sources. |
|
Date: |
Thu, 28 Mar 2019 22:23:34 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 631b20f90b7562807bd527a5eb028beb2229951a
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Fri Mar 29 04:22:17 2019 +0100
gnu: red-eclipse: Use GIT-FETCH for data sources.
* gnu/packages/games.scm (red-eclipse): Update DATA-SOURCE hashes.
[arguments]: COPY-RECURSIVELY instead of extracting tarballs.
[inputs]: Use GIT-FETCH and GIT-FILE-NAME for all DATA-SOURCES.
---
gnu/packages/games.scm | 101 ++++++++++++++++++++++++-------------------------
1 file changed, 49 insertions(+), 52 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d75c095..c9286f8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2899,42 +2899,42 @@ http://lavachat.symlynx.com/unix/";)
(let ((release "1.6.0")
(revision 0)
(data-sources
- '(("acerspyro" "07mzgdahnr3w3w7kf8nmy20r199rimfx9ryqxjdr793sw0vawqd3")
- ("actors" "1hkgscfhg0kmwgym0mw56fhcckzbb2hh3nsvd45v4mdfyk0xnrm7")
- ("appleflap" "1q4xs3x904mrrbxzv6lpr3lywm8p6i8339ijzy9j091s2wdl51ka")
- ("blendbrush"
"004md2haysr9w8fj6l7bj9wcfjqrq9wx1rrjf9dv16k5sbrkqza9")
- ("caustics" "1qmmv8ds70j1ixy4rvli309vbcyjq1l5j1wri6nbnjay10f9fcgq")
- ("crosshairs"
"0q1vadg5cai9i6igl6y08774fd05gav0kinbgb2757n47ig50bns")
- ("dziq" "1s9248ky2qqy24z9c2vgpisz500dvsaj249pv1fkrxgsypjm1z6v")
- ("elyvisions"
"15synpms05996v4c4kdl0h899spl4z7si9kl8c4m7rvc2yvin1ga")
- ("fonts" "1l4727ai8mphi7n3wcjp2lh3p47nh6w82s5dpqbbjpqr9gilb69j")
- ("freezurbern"
"0hcdbzs02mvpsfhmahhqjv6pd8lbsag1bm6rpy61ns5qwmhg96ys")
- ("john" "1whyvlx87mb83kfb7jhhnwz9s7lry4li8l3xar61vmlqgmsnz33d")
- ("jojo" "02wxa93f5al4rlnsdjpd0hlnca0ympnj8481lgdxx70hny8zi3qi")
- ("jwin" "1gb4l7lbhr150hml1y0wbyx7266q5nslh6n494wwrrsvp11s2qk8")
- ("luckystrike"
"0wy2spvhx5k233fsl283250ym5bqvkk8i6i19sw3zvzyxp2p4yq9")
- ("maps" "1dmvp9mskval606z5srjd909jpm6qz4fdcpaszkkhfr5ajbj30vq")
- ("mayhem" "0hkzzx0rxda70ixw9lfh9v1dpsbn2dj86jrr3zxjgasbgaxw37ax")
- ("mikeplus64"
"144fxhp4qjqjw3gvhf7ym6rnfxvxc0zvd3f54jg1jgnccc1hfyah")
- ("misc" "0bpvibyc6vjhbzsf67xxn85yq2h97xs96icbskwzs2wsd860kq8c")
- ("nieb" "0d72wsibk9sg9nhin3fwzz9zljiccyln0fn42y2q2xbd4my23b1k")
- ("nobiax" "19lr36ys98cmpp739svjar1j942fbxz6r062gi7ygh89zh9yrgfy")
- ("particles" "02pnq8ksl7f6kqxss3aza98jssdq2s41rhkhki71ynavp2a5akar")
- ("philipk" "1xkrb7wa1pyhbs4xxx7vnnzsxrqzswk7gjbdac7i7rj0lwnfaij2")
- ("projectiles"
"1hra0f1ifiddh16fv4pqcr2amf046lf445v0653zkyri43zgrj5f")
- ("props" "0ff6a8pz62f4nsk4c9cr50kirw108a661y5j6fvlsjickw3xjmyv")
- ("skyboxes" "1lq58dhrdiivq7llkiyqwpi3bwa89r8hbi98p7zjhw7wdn34i6n2")
- ("snipergoth"
"0d5qf01bxd4dlffgxf8i91zq6mbyjmfd00dpyligpfj6fdbz87gc")
- ("sounds" "0z6jmxsr3w735hrdnxypdb0gi399pwkaycv9grjpiqy43j3ic7gj")
- ("textures" "0k5a47g2z99xn17vw7bqbp0w726gxmk33g5gwmqvfhxxxzzwimvi")
- ("torley" "12x23l8xcv9ard5v76lb210lvp66whsns2p3k3xkd1sabp5ixbd5")
- ("trak" "03kmwj47yb3dqzb6k9kilna9ja8c6jcnblvbs72x15767fl496pb")
- ("ulukai" "0vvd016a7x981ixif6dnlg45s0ak7i89pgyrgwy2fpd94nl2am15")
- ("unnamed" "18sxvdha41njp6g8wn56mjy6w9x778c793gh8fr0h9cnysb5gfmi")
- ("vanities" "1p38mc2566bmb4vdyr9n9s6fkwmynp2xlpdq2a97gzgi4nmm0232")
- ("vegetation"
"0pf3qvqzabdcri5za61z6m89b5hq7sd3q0idkazmx88a62mcclkb")
- ("weapons" "1jr05y9qhhx53plvir35srvv3cmn6wa065p3bskx6h1x6dcbx3c6")
- ("wicked" "14b9f92h8hccp7a015z6rqgbs8236sdyxnwsq991ylnap7cbwvam"))))
+ '(("acerspyro" "12b0bngl7hlxw4iwdbn99jp081yl6z1ic0s788nm349drbr2pck8")
+ ("actors" "0x7qqx67679q6ark9zz02skwhzgabid69kwi6zmhfpfgicn4927r")
+ ("appleflap" "08xslwqfqz3j4m03pv5ry2gdzj5k2ns51z8n6sln3sa94i9x8qkm")
+ ("blendbrush"
"18zf5i2ax4p14x4c9nhk9fq6l1xgbxw62gm72vx59vbfdpjrw3cg")
+ ("caustics" "172fxwx7kbz5nmbjq98kr52ips505wb99fibgnpg8cj02syrya8k")
+ ("crosshairs"
"14w8ysqzdsx9bzpfbl700jzngbh14rdghhjdf6zd6jlkvrl6754r")
+ ("dziq" "056imqszvp90j7cgz52ly0f31px64gsrmvm9k2c78ldbx87jnhc3")
+ ("elyvisions"
"1bsgr0gr7njydj8fqclh0a27lrsyic3xfd5a4vwggw7g54azpgk2")
+ ("fonts" "00ibisza1qci0ghf2rynyf28l6r3nqhfzjf80k6gg76q4v7p1myx")
+ ("freezurbern"
"07l9ldk9b82f12c13wcg5xxdf15bw0yjxk3vvk8v3ygrl2mwksyr")
+ ("john" "1jdmwkrdi5b9pivkm22rxhmkk1db9dx6l54wzcc23cvdz04ij93k")
+ ("jojo" "0f7kjy43fbk9kw8fip6bbw4gn3pryh0fndlahjfkaysrx98krdj3")
+ ("jwin" "0nc8dndnpqk2ad6316a8k6kgzsrkpwvk8s4gyh7aqfi4axfclril")
+ ("luckystrike"
"04jiipqahphmvz5cd74dygr62dlvv6l4iglb8hzh4pp8frhls8bq")
+ ("maps" "0an46ipjvw4h0nxvb6qvnzp1cdkzlkiinqz4zh9lmxy1ds0gclim")
+ ("mayhem" "15k10imm2wr6c6fq35n4r99k7kz7n9zdnjlw6dmdq6fba67i6sbc")
+ ("mikeplus64"
"0v4wiiivm3829j4phlavy22n4c6k6ib9ixxpdz7r6ysg5cdkaw33")
+ ("misc" "13rfgwrlfhflz6inbkg3fypyf8im0m49sw112b17qrw2zgp8i1rz")
+ ("nieb" "0z0h9jdn2gkkjil3vsvwidb1p2k09pi5n3wjxza12hhvqmcs7q8f")
+ ("nobiax" "08bfp4q6gbfis18bp1h4d0hqssk79jc4fhyjxnv21dbam4v4mnkn")
+ ("particles" "1vsx3fgg19xggxfhz3vlrh6nqhmw7kl9kmxrvb2j84blp00vd6z2")
+ ("philipk" "14irscg80607i5k5l2ci0n9nwibvda2f3xsykgv96d0vldrp5n5a")
+ ("projectiles"
"09bnfsrywirwgjm6d7ff5nicx6w6b7w9568x9pb5q0ncaps3l85s")
+ ("props" "1dlabbprlkif8af3daf9nbgcwgxiymvj0yiphqhlri8ylfy2vpz4")
+ ("skyboxes" "14bi3md5y47cvb9ybipdvksz40gqsqw2r0lh3zzqb4acq367w18y")
+ ("snipergoth"
"0m8rvvy5n8n9pm0b5cqvzsxsw51mqk8m7s1h3qc849b38isliwq2")
+ ("sounds" "0ivf3w5bphz5pzzx6kwcb67vbly1l19cgv3s0cyp8n87afiqj5rd")
+ ("textures" "0qdmgx7zbcqnb9rrga2izr93p5inirczhddfxs504rsnv0v8vyxm")
+ ("torley" "05ppyhghq859cbbxzj3dnl9fcx3ghy04ds1pylypwg2hsxzbjwcd")
+ ("trak" "0g3vq86q91a3syli38lwc8ca4ychfwsmmqf85kqzfzyd627ybclm")
+ ("ulukai" "0asa5fz400impklcg6dy2f7jiaqfc1sn1c36fpg8jd01gw66lw93")
+ ("unnamed" "0rz5683j7sfwkcycfypbv4b0ihp0qwn9rzskfsabwc1s5g324917")
+ ("vanities" "13f18783rc8cjf22p61zr8m5g1migzlx05fzl8xnbjdkqq4cdyix")
+ ("vegetation"
"1y5d97nfmvax7y4fr0y5v0c8zb1ajkqwx76kjd4qc9n4spdsi5sc")
+ ("weapons" "103g1dhxv5ffz4ddg2xcbshbgv9606chsbas3pzk6h9ybqsyjrqh")
+ ("wicked" "1884rk34a2dj83gz82rc4zh3ch0dyj5221hvsr0a5h60578i7yj6"))))
(package
(name "red-eclipse")
(version (if (zero? revision)
@@ -2966,15 +2966,10 @@ http://lavachat.symlynx.com/unix/";)
(lambda* (#:key inputs #:allow-other-keys)
(delete-file-recursively "data")
(mkdir "data")
- (for-each (lambda (name)
- (invoke "tar" "-xvf"
- (assoc-ref inputs name)
- "-Cdata"
- "--transform"
- (string-append "s/"
- name "-" ,release "/"
- name "/")))
- (list ,@(map car data-sources)))
+ (with-directory-excursion "data"
+ (for-each (lambda (name)
+ (copy-recursively (assoc-ref inputs name) name))
+ (list ,@(map car data-sources))))
#t))
(add-after 'unpack-data 'add-store-data-package-path-as-default
(lambda* (#:key outputs #:allow-other-keys)
@@ -3046,7 +3041,8 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%"
(chmod "redeclipse_linux" #o555)
(chmod "redeclipse_server_linux" #o555)))
#t)))))
- (native-inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(inputs
`(("curl" ,curl)
("glu" ,glu)
@@ -3058,13 +3054,14 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%"
((name hash)
(list name
(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/red-eclipse/";
- name "/archive/v" release ".tar.gz"))
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url (string-append "https://github.com/";
+ "red-eclipse/" name ".git"))
+ (commit (string-append "v" release))))
(sha256 (base32 hash))
- (file-name (string-append name "-" version
- ".tar.gz"))))))
+ (file-name (git-file-name name version))))))
data-sources)))
(home-page "http://redeclipse.net/";)
(synopsis "Arena shooter derived from the Cube 2 engine")