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

248917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
961aebb1c8 clex: 4.6.patch9 -> 4.6.patch10 2020-10-25 09:43:45 +01:00
Michele Guerini Rocco
c868baa4ca
Merge pull request #101614 from rnhmjoj/arx 
arx-libertatis: 2019-07-22 -> 2020-10-20
 2020-10-25 09:43:28 +01:00
R. RyanTM
87b4e22f0f ckbcomp: 1.196 -> 1.197 2020-10-25 09:43:14 +01:00
R. RyanTM
9baf29e382 cksfv: 1.3.14 -> 1.3.15 2020-10-25 09:42:54 +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
4614342aae xmrig-proxy: 5.11.0 -> 6.3.0 2020-10-25 09:41:09 +01:00
R. RyanTM
c88f981f80 tpm2-abrmd: 2.3.2 -> 2.3.3 2020-10-25 09:40:35 +01:00
R. RyanTM
6a42a70023 open-vm-tools: 11.1.0 -> 11.1.5 2020-10-25 09:39:40 +01:00
R. RyanTM
66699e2ec4 ocamlPackages.ocaml_sqlite3: 5.0.1 -> 5.0.2 2020-10-25 09:38:53 +01:00
R. RyanTM
a2f3c2521c android-udev-rules: 20200410 -> 20200613 2020-10-25 09:37:31 +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
2dd05b3d2f wpgtk: 6.1.0 -> 6.1.3 2020-10-25 09:34:43 +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
R. RyanTM
2f474d44ff storm: 2.1.0 -> 2.2.0 2020-10-25 09:33:38 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Gabriel Ebner
a8a018ddc0
Merge pull request #101409 from rycee/dbus-warning 2020-10-25 09:16:28 +01:00
Michael Raskin
0fc4bba48e
Merge pull request #101632 from 7c6f434c/nyxt-deps 
pkgs.nyxt: init at 2020-10-23
 2020-10-25 08:11:05 +00:00
bqv
be17edc6f6 pkgs.nyxt: init at 2020-10-23 2020-10-25 08:56:12 +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
Bjørn Forsman
7ad5e816fa basex: fix build 
An unmatched double quote in installPhase broke the build in the last update.
Fix it.

Reported by @solson (thanks!).

Fixes: 21b9c04a2c ("basex: 8.6.6 -> 9.4.3")
 2020-10-25 08:12:25 +01:00
lewo
7c84c74897
Merge pull request #101328 from r-ryantm/auto-update/consul_exporter 
prometheus-consul-exporter: 0.6.0 -> 0.7.1
 2020-10-25 08:09:44 +01:00
lewo
68f03380b2
Merge pull request #101393 from 06kellyjac/tekton-cli_0.13.1 
tektoncd-cli: 0.13.0 -> 0.13.1
 2020-10-25 08:07:46 +01:00
Vladimír Čunát
803ca85c20
coreutils: fix aarch64 build by upstream patch 
https://hydra.nixos.org/build/128781441
We can't use fetchpatch here, unfortunately.
 2020-10-25 08:07:15 +01:00
Jörg Thalheim
2f31499703
Merge pull request #101611 from stigtsp/package/firefox-bin-82.0 
firefox-bin: 81.0.2 -> 82.0
 2020-10-25 07:32:30 +01:00
Jörg Thalheim
c8bccb080b
Merge pull request #101624 from taku0/fix_update_nix_for_82 
firefox-bin: fix update.nix freezing
 2020-10-25 07:31:49 +01:00
R. RyanTM
b90d8c6849 dgraph: 20.07.0 -> 20.07.1 2020-10-24 23:18:43 -07:00
R. RyanTM
2948121261 auctex: 12.2 -> 12.3 2020-10-24 23:17:49 -07:00
Luflosi
b8e5d13878 hdparm: name -> pname 2020-10-24 23:06:34 -07: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
taku0
4eacc3784f firefox-bin: fix update.nix freezing 
https://github.com/NixOS/nixpkgs/pull/98338#issuecomment-716070078
 2020-10-25 13:48:42 +09:00
Silvan Mosberger
605b1ecb0c
Merge pull request #101603 from r-ryantm/auto-update/pdd 
pdd: 1.4 -> 1.5
 2020-10-25 05:10:17 +01:00
r-burns
4e88622ac9
bacula: fix build on darwin (#101526) 2020-10-25 00:04:37 -04:00
Benjamin Hipple
1e03f690bb
Merge pull request #101596 from delroth/chiaki-1.3.0 
chiaki: 1.2.1 -> 1.3.0
 2020-10-24 23:10:39 -04:00
Benjamin Hipple
64a620f8d3
Merge pull request #101418 from arcnmx/terraform-providers-github 
terraform-providers.github: 2.8.0 -> 3.1.0
 2020-10-24 23:10:13 -04:00