Commit Graph
271135 Commits
Author SHA1 Message Date
SandroandGitHub 87abd5c0aa Merge pull request #104694 from rissson/kivy-2.0 2021-02-18 12:11:46 +01:00
Jacek GalowiczandGitHub bc7a369c68 Merge pull request #112961 from r-burns/nixos-test-grub
nixosTests.installer: fix non-zfs grub tests
2021-02-18 11:58:57 +01:00
Michael WeissandGitHub eecade6b3e Merge pull request #113313 from primeos/nix-prefetch-git-avoid-initial-branch-warnings
nix-prefetch-git: Run git-init with --initial-branch=master
2021-02-18 11:53:11 +01:00
Michael Weiss 2aadb9a53d nix-prefetch-git: Run git-init with --initial-branch=master
The reason for this change is simply to avoid the following messages
that are unnecessary and can be confusing (and these messages will be
repeated for each submodule):
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint:   git config --global init.defaultBranch <name>
hint:
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint:
hint:   git branch -m <name>

With this change the behaviour remains unchanged (apart from the
suppressed "warning" in the console output of course) and therefore this
doesn't cause any hashes to change and by default nix-prefetch-git uses
the "fetchgit" branch anyway (branchName can be set to override the
default):
Switched to a new branch 'fetchgit'

For that reason the initial branch name doesn't matter anyway and since
we're not relying on / hardcoding "master" we could simply switch to
"main" (which seems most common nowadays). See [0] for more details on
why this wouldn't break anything.
However, since the initial branch name doesn't matter and to avoid any
additional risks it was "decided" to keep using "master" (s. #113313).

[0]: https://github.com/NixOS/nixpkgs/pull/113313#issuecomment-780589516
2021-02-18 11:34:34 +01:00
adisbladisandGitHub d5f32c5b53 Merge pull request #113572 from johanot/dockertools-deterministic-customisation-layer
dockertools: sort tar-members by name for reproducibility
2021-02-18 11:13:32 +01:00
adisbladisandGitHub d63685c2f9 Merge pull request #113567 from adisbladis/rmfuse
rmfuse: init at 0.1.1
2021-02-18 11:12:27 +01:00
Michele Guerini RoccoandGitHub 0b87306283 Merge pull request #113146 from MetaDark/wine
winePackages: enable mingwSupport in base build
2021-02-18 11:04:42 +01:00
Ryan Burns 5406db08bf nixosTests.installer: increase EFI partition size
Needed for simpleUefiGrub test to pass on aarch64
Runs out of space otherwise
2021-02-18 01:58:25 -08:00
Peter Hoeg 88eb9ce528 shards: 0.12 -> 0.13 2021-02-18 09:11:23 +00:00
Peter Hoeg 53ea6aee81 crystal: 0.36 -> 0.36.1 2021-02-18 09:11:23 +00:00
adisbladis 6b403ed151 rmfuse: init at 0.1.1 2021-02-18 10:06:00 +01:00
LeUlukaiandEdward Tjörnhammar 8199872bba jetbrains: updates 2021-02-18 08:53:12 +00:00
Johan Thomsen 793e77d4e2 dockertools: sort tar-members by name for reproducibility 2021-02-18 09:51:41 +01:00
adisbladisandGitHub ba1643d29d Merge pull request #113564 from adisbladis/poetry2nix-1_15_5
poetry2nix: 1.15.4 -> 1.15.5
2021-02-18 09:43:54 +01:00
adisbladis e22280882c poetry2nix: 1.15.4 -> 1.15.5 2021-02-18 09:28:07 +01:00
Daniel FullmerandGitHub 8d007abd0b zerotierone: 1.6.3 -> 1.6.4 (#113548) 2021-02-18 08:25:46 +00:00
Frederik RietdijkandGitHub 2a78ea9435 Merge pull request #112095 from NixOS/staging-next
Staging next
2021-02-18 08:50:07 +01:00
R. RyanTMandGitHub 4ef6da455e doppler: 3.22.0 -> 3.22.1 (#113554) 2021-02-17 21:08:42 -10:00
Elis HirwingandGitHub 5134396431 Merge pull request #113414 from r-ryantm/auto-update/php-phpstan
php73Packages.phpstan: 0.12.74 -> 0.12.76
2021-02-18 07:46:43 +01:00
R. RyanTMandJonathan Ringer aba5259df2 python37Packages.flask-compress: 1.8.0 -> 1.9.0 2021-02-17 22:35:56 -08:00
R. RyanTMandJonathan Ringer dec715e53d python37Packages.labelbox: 2.4.9 -> 2.4.10 2021-02-17 22:35:40 -08:00
github-actions[bot]andGitHub 45dc900af9 Merge master into staging-next 2021-02-18 06:16:42 +00:00
R. RyanTMandCole Helbling 3a44e01128 nwg-launchers: 0.4.3 -> 0.4.4 2021-02-17 21:18:01 -08:00
David AndersonandCole Helbling 2bb5ff0da2 zrepl: init at 0.3.1.
Signed-off-by: David Anderson <dave@natulte.net>
2021-02-17 20:18:30 -08:00
SandroandGitHub 5e260c3c5c Merge pull request #111914 from oxzi/weechat-scripts-multiline
weechatScripts.multiline: init at 0.6.3
2021-02-18 04:02:19 +01:00
SandroandGitHub 5db1943bda Merge pull request #113409 from rhoriguchi/vscode-extensions/hashicorp.terraform
vscode-extensions.hashicorp.terraform: Init at 2.6.0
2021-02-18 04:01:16 +01:00
Robin LambertzandGitHub adf9976e1c redis-desktop-manager: Fix 'missing plugin "xcb"' (#113293) 2021-02-18 02:57:50 +01:00
Ryan MulliganandGitHub 9bb643272a Merge pull request #113324 from r-ryantm/auto-update/bpytop
bpytop: 1.0.61 -> 1.0.62
2021-02-17 17:49:10 -08:00
Ryan MulliganandGitHub acd6580afc Merge pull request #113344 from r-ryantm/auto-update/filebot
filebot: 4.9.2 -> 4.9.3
2021-02-17 17:48:43 -08:00
SandroandGitHub d9fe956d22 Merge pull request #113531 from fabaff/bump-metasploit
metasploit: 6.0.29 -> 6.0.30
2021-02-18 02:48:17 +01:00
Ryan MulliganandGitHub 8620d7832b Merge pull request #112547 from r-ryantm/auto-update/visualvm
visualvm: 2.0.5 -> 2.0.6
2021-02-17 17:47:59 -08:00
SandroandGitHub 907ec9f64a Merge pull request #113512 from SuperSandro2000/topgrade2
topgrade: 6.5.1 -> 6.5.2
2021-02-18 02:47:45 +01:00
SandroandGitHub a2d64c5092 Merge pull request #113532 from WolfangAukang/upwork-5.5.0.1
upwork: 5.4.9.6 -> 5.5.0.1
2021-02-18 02:45:46 +01:00
Ryan MulliganandGitHub f3f0006d68 Merge pull request #113389 from r-ryantm/auto-update/mkgmap
mkgmap: 4600 -> 4601
2021-02-17 17:44:53 -08:00
Ryan MulliganandGitHub af6f2b8290 Merge pull request #113183 from r-ryantm/auto-update/operator-sdk
operator-sdk: 1.4.0 -> 1.4.1
2021-02-17 17:43:50 -08:00
Ryan MulliganandGitHub 551700bbfe Merge pull request #113281 from r-ryantm/auto-update/minio-client
minio-client: 2021-02-10T07-32-57Z -> 2021-02-14T04-28-06Z
2021-02-17 17:12:20 -08:00
Ryan MulliganandGitHub ef9941e6ae Merge pull request #113279 from r-ryantm/auto-update/minio
minio: 2021-02-11T08-23-43Z -> 2021-02-14T04-01-33Z
2021-02-17 17:11:47 -08:00
Ryan MulliganandGitHub 24f8d1083b Merge pull request #112539 from r-ryantm/auto-update/tracy
tracy: 0.7.5 -> 0.7.6
2021-02-17 17:10:29 -08:00
Orivej Desh 68b95f0bdf librseq: specify that lgpl21 is lgpl21Only 2021-02-18 00:55:45 +00:00
SandroandGitHub 983f4d6894 Merge pull request #113522 from SuperSandro2000/fix-collection15 2021-02-18 01:45:41 +01:00
Tim Steinbach 6287181218 linux/hardened/patches/5.4: 5.4.98-hardened1 -> 5.4.99-hardened1 2021-02-17 19:43:52 -05:00
Tim Steinbach 6289df0590 linux/hardened/patches/5.10: 5.10.16-hardened1 -> 5.10.17-hardened1 2021-02-17 19:43:42 -05:00
github-actions[bot]andGitHub 683536ab2a Merge master into staging-next 2021-02-18 00:40:58 +00:00
Bernardo MeurerandGitHub fd2233556f Merge pull request #113336 from lovesegfault/google-cloud-sdk-328
google-cloud-sdk: 327.0.0 -> 328.0.0
2021-02-18 00:22:23 +00:00
P. R. d. O 1aaec9ad30 upwork: 5.4.9.6 -> 5.5.0.1 2021-02-17 18:07:50 -06:00
Sandro Jäckel e20952b311 pythonPackages.yapsy: mark broken on darwin 2021-02-18 00:40:22 +01:00
Sandro Jäckel 8ac073a0e1 pythonPackages.nbdime: disable failing test 2021-02-18 00:40:22 +01:00
Sandro Jäckel c3fa2657af pythonPackages.jupyterhub: mark broken on darwin 2021-02-18 00:40:21 +01:00
SandroandGitHub c085a3f1d0 Merge pull request #113486 from fabaff/pyeight 2021-02-18 00:30:28 +01:00
SandroandGitHub 9c1234de81 Merge pull request #113485 from rileyinman/iosevka-bin-5.0
iosevka-bin: 4.5.0 -> 5.0.2
2021-02-18 00:29:46 +01:00