Commit Graph

126329 Commits

Author SHA1 Message Date
Will Dietz
0e95bed017 nix-prefetch-git: fix extraction of submodule hashes on latest git
Summary:

According to git-submodule manpage,
"git submodule status" prefixes the hash with a '-' if it is not
initialized, and other chars in other circumstances.
(this is consistent on the various git versions tested)

nix-prefetch-git runs "git submodule init" which does you'd think,
but apparently despite this earlier versions of git before 2.16
would still give the hash the '-' suffix.
In particular this is the behavior when using 2.15 and 2.14.1
from the nixos-17.09 and nixos-17.03 channels respectively.

The script then used awk to drop the first char of the first field
which does the wrong thing when there is no prefix emitted:
while there is a space character before the hash, this is not
part of the field and so we ended up eating the first character
of the hash.

To fix this in a way that also works with the previous behavior,
this commit instead uses awk to grab the hash field
and uses tr to delete any '-' chars should they be present.

This seems to work in my testing, and for example can now
successfully fetch the source for "nginxModules.brotli"
where previously it would generate an error:

fatal: '22564a95d9ab58865a096b8d9f7324ea5f2e03e' is not a commit and a branch 'fetchgit' cannot be created from it

(we dropped a '2' from the beginning of the hash)
2018-01-24 20:18:59 +02:00
Jörg Thalheim
bb7e244531
Merge pull request #34144 from mnacamura/cdda-fix-share-dir
cataclysm-dda{,-git}: fix share directory
2018-01-24 17:39:51 +00:00
Jörg Thalheim
a3d6f38adf
Merge pull request #34116 from brown131/patch-1
Update hy to latest version
2018-01-24 17:02:14 +00:00
Tuomas Tynkkynen
d02c2d694e nixos/sd-image-*.nix: Bring back high consoleLogLevel
3d040f93051866 removed it from installation-device.nix, but the default
loglevel is just too low for ARM and the like.
2018-01-24 18:23:32 +02:00
Tuomas Tynkkynen
cd2e740dde nixos/sd-image-aarch64.nix: Set avoid_warnings in RPi config.txt
Also add some comments on the existing config settings as well.
2018-01-24 18:23:31 +02:00
adisbladis
f7dd6951aa
go: 1.9.2 -> 1.9.3 2018-01-24 23:00:26 +08:00
Peter Simons
9ffaa69da4
Merge pull request #34209 from LnL7/darwin-libR
R: fix dylib install_name on darwin
2018-01-24 12:59:07 +01:00
Jörg Thalheim
b0dd3a189d
Merge pull request #34219 from bkchr/googlemaps_fix_plugin_dir
googlemaps: Move the .so to the right location
2018-01-24 11:07:46 +00:00
Ioannis Koutras
b309103577 skrooge: 2.9.0 -> 2.10.5
fixes #34163
2018-01-24 10:56:54 +00:00
Bastian Köcher
bf14737288 googlemaps: Move the .so to the right location
Fixes Subsurface googlemaps plugin detection.
2018-01-24 11:39:02 +01:00
Peter
01941c5155 terminator: 1.0 -> 1.91 (#34218)
* terminator: 1.0 -> 1.91

* terminator: wrapGAppsHook is a native build input
2018-01-24 10:10:42 +00:00
adisbladis
a75160e25e
firefox-devedition-bin: 59.0b2 -> 59.0b3 2018-01-24 16:49:41 +08:00
adisbladis
cba40384c0
firefox-beta-bin: 58.0b16 -> 59.0b3 2018-01-24 16:49:40 +08:00
adisbladis
8fd86b86eb
Merge pull request #34200 from dtzWill/update/siege-4.0.4
siege: 4.0.2 -> 4.0.4
2018-01-24 16:25:58 +08:00
adisbladis
d0127fec09
Merge pull request #34196 from dotlambda/abcm2ps
abcm2ps: 8.13.18 -> 8.13.19
2018-01-24 16:24:49 +08:00
Frederik Rietdijk
02c8939f2e
Merge pull request #34146 from symphorien/fix-epkowa
Fix epkowa
2018-01-24 08:41:22 +01:00
Frederik Rietdijk
25e3e2d69d
Merge pull request #33626 from thanegill/rxpy-init
pythonPackages.rx: init at 1.6.0
2018-01-24 08:27:15 +01:00
Jörg Thalheim
976d17fb5e python.pkgs.astor: also disable some test on python2 2018-01-24 06:24:16 +00:00
Jörg Thalheim
3b6b52b19f python.pkgs.astor: fix python 3.6 tests 2018-01-24 06:21:40 +00:00
adisbladis
4d0499ac56
Merge pull request #34213 from eqyiel/flow-0.64.0
flow: 0.63.1 -> 0.64.0
2018-01-24 13:52:04 +08:00
Ruben Maher
e17d01dffc flow: 0.63.1 -> 0.64.0 2018-01-24 13:13:10 +10:30
Graham Christensen
2a2793f618
Merge pull request #34085 from ikervagyok/samba
samba: 4.6.11 -> 4.7.4
2018-01-23 20:55:15 -05:00
Franz Pletz
9f16756f77
atlassian-jira: 7.5.2 -> 7.7.0 2018-01-24 02:14:54 +01:00
Franz Pletz
8c88168d2d
atlassian-confluence: 6.5.1 -> 6.6.0 2018-01-24 02:14:53 +01:00
Franz Pletz
2ac833d3f5
youtubeDL: 2018.01.14 -> 2018.01.21 2018-01-24 02:13:14 +01:00
Graham Christensen
397bfc9d50
Merge pull request #34211 from nico202/master
enchive: 3.3 -> 3.4
2018-01-23 19:35:08 -05:00
Graham Christensen
f2636ebb41
Merge pull request #34197 from zauberpony/vultr-1.15.0
vultr: 1.13.0 -> 1.15.0
2018-01-23 19:29:24 -05:00
Nicolò Balzarotti
9b9ff1aa60 enchive: 3.3 -> 3.4 2018-01-24 01:00:20 +01:00
John Ericson
e23b6a394b
Merge pull request #34201 from dezgeg/release-refactor-3
nixos/release.nix: Introduce callSubTestsOnTheseSystems
2018-01-23 18:40:07 -05:00
Daiderd Jordan
5569851745
R: fix dylib install_name on darwin 2018-01-24 00:23:16 +01:00
Joachim F
d9604c861a
Merge pull request #34192 from mdorman/semi-automated-emacs-package-updates
Semi automated emacs package updates
2018-01-23 22:20:42 +00:00
Jan Tojnar
c7dc968721
Merge pull request #34186 from jonafato/gnome-shell-extension-nohotcorner
gnome-shell-extension-nohotcorner: init at 16.0
2018-01-23 23:18:01 +01:00
Tuomas Tynkkynen
b4c12eef30 wget: 1.19.2 -> 1.19.4 2018-01-23 23:52:00 +02:00
Tuomas Tynkkynen
d9aebebaf5 Revert "perf: apply patch to fix build of 4.9"
This reverts commit 44dc31bad1a3e35fd07c78fb3ecf1811db8f95e3.

The patch has been applied in 4.9.78, so no need to have this in
nixpkgs anymore.
2018-01-23 23:17:24 +02:00
Tuomas Tynkkynen
acf5b8e662 kernel: 4.9.77 -> 4.9.78 2018-01-23 23:17:24 +02:00
Tuomas Tynkkynen
4276c0d898 kernel: 4.4.112 -> 4.4.113 2018-01-23 23:17:24 +02:00
Tuomas Tynkkynen
1481937af2 kernel: 4.14.14 -> 4.14.15 2018-01-23 23:17:24 +02:00
Dan Peebles
533cc72d4d nixUnstable: pre5849_74f75c85 -> pre5873_b76e282d 2018-01-23 16:07:25 -05:00
Vladimír Čunát
24fe57dfc8
Merge #34073: firefox-{bin,esr}: update 2018-01-23 21:34:41 +01:00
Tuomas Tynkkynen
0663e972a4 ponyc: Not supported on aarch64
https://hydra.nixos.org/build/67722376
2018-01-23 21:42:30 +02:00
Tuomas Tynkkynen
3cd40f1a4f pypy: Doesn't support aarch64
https://hydra.nixos.org/build/67861197
2018-01-23 21:42:30 +02:00
Robert Helgesson
c73a140573
perl-Log-Any: 1.704 -> 1.705 2018-01-23 20:36:19 +01:00
Will Dietz
b0832f89f5 siege: 4.0.2 -> 4.0.4 2018-01-23 13:11:57 -06:00
Robert Helgesson
c32755ceac
eclipse-plugin-autodetect-encoding: 1.8.4 -> 1.8.5 2018-01-23 19:39:20 +01:00
Daiderd Jordan
6109b15709
Merge pull request #34195 from dtzWill/feature/vim-dirdiff
vim-plugins: Add vim-dirdiff
2018-01-23 19:06:31 +01:00
Thane Gill
df43f58dc6 pythonPackages.rx: init at 1.6.0 2018-01-23 10:03:17 -08:00
Robert Schütz
0affe46a32 abcm2ps: 8.13.18 -> 8.13.19, fix in non-GNU stdenv 2018-01-23 18:56:54 +01:00
Elmar Athmer
adabeea0b8 vultr: 1.13.0 -> 1.15.0 2018-01-23 18:44:18 +01:00
Frederik Rietdijk
baaf8fd2b8
Merge pull request #33495 from magnetophon/faust2
faust2: 2.1.0 -> 2.5.10
2018-01-23 17:56:42 +01:00
Frederik Rietdijk
8510550b77
Merge pull request #34169 from Infinisil/add/almonds
almonds: init at 2015-12-27
2018-01-23 17:37:54 +01:00