JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
248,918 Commits 2 Branches 0 Tags 13 GiB
8c9bb91c34
Commit Graph

89965 Commits

Author SHA1 Message Date
zowoq
8c9bb91c34 go_bootstrap: disable failing timezone tests 2020-10-28 00:37:40 +10:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge 
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
 2020-10-26 09:01:04 +01:00
Vladimír Čunát
4bd836b381
Merge branch 'master' into staging-next 2020-10-25 09:46:04 +01:00
TredwellGit
4effe769e2
libraw: 0.20.0 -> 0.20.2 
Reapplying the commit from PR #101508 merge, without staging changes.
(cherry picked from commit 0594e27df3)
 2020-10-25 09:44:10 +01:00
R. RyanTM
c04af4e84b twitterBootstrap: 4.5.2 -> 4.5.3 2020-10-25 09:42:37 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
 2020-10-25 09:41:51 +01:00
R. RyanTM
38f85a5bba libquotient: 0.5.3.2 -> 0.6.0 2020-10-25 09:41:28 +01:00
R. RyanTM
66699e2ec4 ocamlPackages.ocaml_sqlite3: 5.0.1 -> 5.0.2 2020-10-25 09:38:53 +01:00
R. RyanTM
e4467c94ae socket_wrapper: 1.2.4 -> 1.2.5 2020-10-25 09:35:43 +01:00
R. RyanTM
3e735cf1fe libnetfilter_queue: 1.0.4 -> 1.0.5 2020-10-25 09:35:19 +01:00
R. RyanTM
e874acc509 belcard: 4.3.1 -> 4.4.0 2020-10-25 09:34:18 +01:00
R. RyanTM
10d87a72e1 ctypes_sh: 1.1 -> 1.2 2020-10-25 09:34:01 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Mario Rodas
cbe6fd3473
Merge pull request #101441 from marsam/fix-darwin-build 
ruby: fix build on darwin
 2020-10-25 02:45:51 -05:00
Vladimír Čunát
ed217bcc35
Merge #100446: python*Packages.apprise: fix dependencies 2020-10-25 08:39:18 +01:00
zowoq
10e961cdf9 haskellPackages.trifecta: dontCheck on darwin 2020-10-25 15:59:31 +10:00
R. RyanTM
ec6380c788 python37Packages.trimesh: 3.8.11 -> 3.8.12 2020-10-24 22:55:33 -07:00
R. RyanTM
c56920d57c python37Packages.flowlogs_reader: 2.2.1 -> 2.3.0 2020-10-24 22:55:17 -07:00
R. RyanTM
3b8c31e301 pwntools: 4.2.1 -> 4.2.2 2020-10-24 22:54:17 -07:00
R. RyanTM
6aa1757d3f python37Packages.google_cloud_storage: 1.31.2 -> 1.32.0 2020-10-24 22:53:10 -07:00
R. RyanTM
9571b4f722 python37Packages.chalice: 1.21.1 -> 1.21.2 2020-10-24 22:51:36 -07:00
R. RyanTM
e6a40af16c python37Packages.nbclient: 0.5.0 -> 0.5.1 2020-10-24 22:35:05 -07:00
R. RyanTM
114acff2a5 python37Packages.jupyterlab-git: 0.22.1 -> 0.22.2 2020-10-24 22:34:21 -07:00
R. RyanTM
051c359764 python37Packages.css-parser: 1.0.4 -> 1.0.5 2020-10-24 22:22:45 -07:00
Benjamin Hipple
b37c1985a6
Merge pull request #101577 from jonafato/kind-0.9.0 
kind: 0.8.1 -> 0.9.0
 2020-10-24 22:50:30 -04:00
Michael Raskin
61d82f08f7
Merge pull request #101609 from 7c6f434c/nyxt-deps 
lispPackages.nyxt: build a binary
 2020-10-24 23:43:03 +00:00
Michael Raskin
4d73ca7b48 lispPackages.nyxt: build a binary 2020-10-25 01:30:44 +02:00
Aaron Andersen
a5061c6f87
Merge pull request #101032 from aanderse/libcec 
libcec: 4.0.5 -> 4.0.7
 2020-10-24 18:50:06 -04:00
Andreas Rammhold
250fb4611f
Merge pull request #100456 from maralorn/boolToString 
treewide: De-inline uses of lib.boolToString
 2020-10-25 00:45:11 +02:00
Michael Raskin
619173b237 lispPackages.nyxt: init, based on code from bqv 2020-10-24 23:24:50 +02:00
Michael Raskin
d4f98f24cb lispPackages.cluffer: init (package from bqv) 2020-10-24 23:04:20 +02:00
Michael Raskin
abcdffb6a2
Merge pull request #101595 from 7c6f434c/nyxt-deps 
lispPackages: more Nyxt deps
 2020-10-24 20:39:47 +00:00
Michael Raskin
26a0533979 lispPackages: more Nyxt deps 2020-10-24 22:23:58 +02:00
Ryan Mulligan
88ebc5e7ad
Merge pull request #101570 from r-ryantm/auto-update/duktape 
duktape: 2.5.0 -> 2.6.0
 2020-10-24 12:39:22 -07:00
Michael Raskin
6645997369
Merge pull request #101581 from 7c6f434c/nyxt-deps 
lispPackages: more Nyxt deps
 2020-10-24 18:49:30 +00:00
Michael Raskin
6c76bc2949 lispPackages.cl-webkit2: init 2020-10-24 20:31:59 +02:00
Michael Raskin
d97a71865e lispPackages: more Nyxt deps 2020-10-24 20:14:01 +02:00
Benjamin Hipple
d9eafeb9ae
Merge pull request #101546 from magnetophon/redkite 
redkite: 1.0.3 -> 1.1.0
 2020-10-24 13:13:18 -04:00
Michael Raskin
a41d154ced
Merge pull request #101576 from 7c6f434c/nyxt-deps 
lispPackages: more stuff (for Nyxt)
 2020-10-24 17:11:22 +00:00
Jon Banafato
d0bc05438b kind: 0.8.1 -> 0.9.0 
kind has a new bugfix release. [Changelog](https://github.com/kubernetes-sigs/kind/releases/tag/v0.9.0)

This commit also enables fish completions, which were added to kind in
0.8.0.
 2020-10-24 12:37:52 -04:00
Michael Raskin
588501bcb2 lispPackages: more stuff 2020-10-24 18:36:09 +02:00
Maximilian Bosch
c9377b9eef
Merge pull request #101566 from r-ryantm/auto-update/cppcheck 
cppcheck: 2.1 -> 2.2
 2020-10-24 18:14:59 +02:00
Maximilian Bosch
8733608fde
Merge pull request #101541 from JesusMtnez/coursier 
coursier: 2.0.4 -> 2.0.5
 2020-10-24 18:08:16 +02:00
R. RyanTM
5f43184565 duktape: 2.5.0 -> 2.6.0 2020-10-24 16:03:19 +00:00
R. RyanTM
57dc5ba564 cppcheck: 2.1 -> 2.2 2020-10-24 15:27:39 +00:00
Michael Raskin
18a170fe8e
Merge pull request #101544 from 7c6f434c/sbcl-update 
sbcl: 2.0.0 -> 2.0.8; add 2.0.9; lispPackages: regenerate
 2020-10-24 13:19:34 +00:00
Lassulus
49701c3bf8
Merge pull request #101495 from makefu/pkgs/iozone/3.490 
iozone: 3.471 -> 3.490
 2020-10-24 14:42:32 +02:00
Maximilian Bosch
5fd98f75c6
Merge pull request #101535 from etu/php-packages-updates 
phpPackages and phpExtensions updates
 2020-10-24 14:39:47 +02:00
Bart Brouns
4c0404eea1 redkite: 1.0.3 -> 1.1.0 2020-10-24 13:59:08 +02:00
Michael Raskin
c4c06f5989
pkgs/development/lisp-modules/README.txt : typo fix 
Co-authored-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
 2020-10-24 11:53:43 +00:00