jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7c751ccba1
nixpkgs/pkgs/development
History
Dmitry Kalinkin c455adcc42
Merge branch 'master' into staging-next 
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564f9a6281e14d7a7279b8589521e2c48 which
adapts #69210 to master that doesn't yet have
329a88efa78126ae7413807ce58000eab49e82d9

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:21:46 -04:00
..
androidndk-pkgs androidndk: get correct libs for x86_64 2019-09-23 13:40:45 -04:00
arduino treewide: use libtinfo.so.5 where needed 2019-09-18 13:57:20 -04:00
beam-modules
bower-modules/generic
compilers Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
coq-modules
dhall-modules
dotnet-modules/patches
em-modules/generic
go-modules
go-packages
guile-modules
haskell-modules Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
idris-modules idrisPackages.heyting-algebra: remove 2019-09-24 19:50:04 +02:00
interpreters Merge branch 'master' into staging-next 2019-09-22 16:39:12 +02:00
java-modules jogl: remove #37364 workaround 2019-09-15 19:00:15 +00:00
libraries Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
lisp-modules Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
lua-modules Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
misc
mobile
node-packages Merge pull request #69219 from rileyinman/iosevka 2019-09-24 10:16:44 -05:00
ocaml-modules Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
perl-modules Re-Revert "Merge branch 'staging-next'" 2019-09-22 09:38:09 +02:00
pharo
pure-modules Re-Revert "Merge branch 'staging-next'" 2019-09-22 09:38:09 +02:00
python-modules Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
r-modules Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
ruby-modules Re-Revert "Merge branch 'staging-next'" 2019-09-22 09:38:09 +02:00
tools Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
web nodejs-10_x: 10.16.0 -> 10.16.3 2019-09-18 04:20:00 -05:00