mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 11:40:45 +00:00
Code Issues Wiki Activity
318072 commits 267 branches 124 tags 6 GiB
Commit graph

817 commits

Author SHA1 Message Date
Jörg Thalheim a65e3b66cb
Merge pull request #137601 from fzakaria/faridzakaria/glibc-netbase 
glibc: allow environment variable for /etc/ files (i.e. /etc/protocols)
 2021-09-21 08:07:02 +01:00
github-actions[bot] f666c4d10f
Merge master into staging-next 2021-09-20 06:01:17 +00:00
Farid Zakaria 4687d7523b glibc: add dependency on netbase /etc/protocols 
Add an explicit dependency on netbase for /etc/protocols

Certain functions in glibc look for files present in /etc such as getprotobyname which reads /etc/protocols.
If you are using Nix over a Linux installation, this file may not be present, and therefore it will cause errors.

- add netbase as a new package in nixpks
- add a dependency in glibc on it using postPatchPhase and substitute
the path

Fixes #124401
 2021-09-19 19:37:56 -07:00
github-actions[bot] c4fd2a8f99
Merge master into staging-next 2021-09-18 00:01:33 +00:00
(cdep)illabout 548e93f7a1
all-cabal-hashes: 2021-09-10T22:56:58Z -> 2021-09-17T18:08:40Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-09-18 03:33:13 +09:00
github-actions[bot] b7d0ebd8f8
Merge master into haskell-updates 2021-09-16 00:06:30 +00:00
github-actions[bot] ff5297bcd3
Merge staging-next into staging 2021-09-11 12:01:45 +00:00
Alyssa Ross 56314db098
Merge remote-tracking branch 'nixpkgs/master' into staging-next 
Conflicts:
	pkgs/development/compilers/ghc/8.10.7.nix
	pkgs/development/compilers/ghc/8.8.4.nix

I've removed the isWindows check from useLdGold in ghc, since that should
be covered by the new hasGold check.
 2021-09-11 10:49:13 +00:00
(cdep)illabout 8a3fa78f1b
all-cabal-hashes: 2021-09-06T23:06:06Z -> 2021-09-10T22:56:58Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-09-11 11:30:14 +09:00
Luke Granger-Brown 9094826af8 Merge remote-tracking branch 'upstream/staging-next' into staging-fix 2021-09-07 16:23:11 +00:00
Vladimír Čunát dbc3228248
Merge branch 'master' into staging-next 
(It's a little older version of master, to bring haskell updates now.)
 2021-09-07 08:21:02 +02:00
(cdep)illabout 121cc7c0dc
all-cabal-hashes: 2021-09-03T13:28:39Z -> 2021-09-06T23:06:06Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-09-07 10:51:23 +09:00
Martin Weinelt 7f732aca66 Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next" 
This reverts commit b041b2e1b2, reversing
changes made to 5b6c2380ad.
 2021-09-05 15:02:25 +02:00
Martin Weinelt b041b2e1b2 Merge remote-tracking branch 'origin/python-unstable' into staging-next 2021-09-05 14:51:26 +02:00
github-actions[bot] e750a74632
Merge staging-next into staging 2021-09-04 00:02:10 +00:00
Alyssa Ross 071a7a4583
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-03 18:23:45 +00:00
Joe Hermaszewski 73be7eaf64
all-cabal-hashes: 2021-08-23T13:50:03Z -> 2021-09-03T13:28:39Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-09-03 15:04:38 +01:00
Sandro ea1b1cb084
Merge pull request #135343 from SuperSandro2000/shared-mime-info 
shared-mime-info: split outputs
 2021-08-24 14:23:42 +02:00
Joe Hermaszewski b1ab44bb76
all-cabal-hashes: 2021-08-22T14:40:47Z -> 2021-08-23T13:50:03Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-08-23 23:17:57 +08:00
Jan Tojnar 4ff3577f25 Merge branch 'staging-next' into staging 2021-08-23 14:19:54 +02:00
Sandro Jäckel 7feefdc31c
shared-mime-info: split outputs 2021-08-23 02:25:01 +02:00
Malte Brandy 8f3983e233
all-cabal-hashes: 2021-08-17T22:21:14Z -> 2021-08-22T14:40:47Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-08-22 19:58:32 +02:00
Malte Brandy e50885838b
all-cabal-hashes: 2021-08-17T22:21:14Z -> 2021-08-17T22:21:14Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-08-18 02:13:28 +02:00
Jan Tojnar e286e1cfa0 Merge branch 'staging-next' into staging 
- boost 167 removed on staging-next (7915d1e03f) × boost attributes are inherited on staging (d20aa4955d)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507) × hardened kernels are versioned on staging (a5341beb78) + removed linux_5_12 (e55554491d)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
 2021-08-17 18:52:37 +02:00
Lassulus 99c5bf354e
Merge pull request #133889 from r-ryantm/auto-update/wireless-regdb 
wireless-regdb: 2021.04.21 -> 2021.07.14
 2021-08-17 09:49:21 +02:00
github-actions[bot] 60b1048b91
Merge master into haskell-updates 2021-08-16 00:06:12 +00:00
github-actions[bot] 4dfde9ac8e
Merge staging-next into staging 2021-08-15 18:01:33 +00:00
R. RyanTM d1434fd896 wireless-regdb: 2021.04.21 -> 2021.07.14 2021-08-14 06:24:20 +00:00
Daniel Nagy 3e51989b06
spdx-license-list-data: 3.13 -> 3.14 2021-08-12 23:14:19 +02:00
Jan Tojnar 807d3ec359 Merge branch 'staging-next' into staging 
; Conflicts:
;	pkgs/tools/misc/t1utils/default.nix
 2021-08-11 16:34:11 +02:00
Malte Brandy 0ad7297bea
all-cabal-hashes: 2021-08-07T10:52:35Z -> 2021-08-10T19:15:27Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-08-10 22:19:49 +02:00
Fabian Affolter 8823bc8c00
Merge pull request #132806 from maxeaubrey/mobile-broadband-provider-info_20210805 
mobile-broadband-provider-info: 202001225 -> 20210805
 2021-08-09 14:36:32 +02:00
github-actions[bot] 00856683aa
Merge master into haskell-updates 2021-08-09 00:06:41 +00:00
Artturi 5f0ab7555d
Merge pull request #132733 from r-ryantm/auto-update/ddccontrol-db 
ddccontrol-db: 20210505 -> 20210804
 2021-08-08 22:21:05 +03:00
github-actions[bot] 40442d5b19
Merge staging-next into staging 2021-08-07 18:01:40 +00:00
sternenseemann 981cf6a6e2 all-cabal-hashes: 2021-08-04T07:53:53Z -> 2021-08-07T10:52:35Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-08-07 16:17:16 +02:00
Maxine Aubrey 44fbbb22c2
mobile-broadband-provider-info: 202001225 -> 20210805 2021-08-06 10:30:44 +02:00
R. RyanTM 24ba262fbe ddccontrol-db: 20210505 -> 20210804 2021-08-05 05:16:00 +00:00
github-actions[bot] 05e0d6aadf
Merge staging-next into staging 2021-08-04 12:01:50 +00:00
sternenseemann 256f507fe0 all-cabal-hashes: 2021-07-29T16:00:40Z -> 2021-08-04T07:53:53Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-08-04 12:33:53 +02:00
Sandro Jäckel 419a0f39ac
cacert: convert to pname + version, format, cleanup 2021-07-30 15:10:52 +02:00
sternenseemann 4eb88b29d2 all-cabal-hashes: 2021-07-26T15:54:23Z -> 2021-07-29T16:00:40Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh

Additional changes:

* haskellPackages.distribution-nixpkgs: allow 1.6.0

* haskellPackages: regenerate using
  `maintainers/scripts/haskell/regenerate-hackage-packages.sh`.
 2021-07-30 11:25:05 +02:00
sterni c3141f24f0
Merge pull request #131591 from NixOS/haskell-updates 
haskellPackages: update stackage and hackage
 2021-07-29 17:50:39 +02:00
github-actions[bot] 62c8cb1826
Merge master into haskell-updates 2021-07-28 00:06:03 +00:00
github-actions[bot] 2692c2e427
Merge master into staging-next 2021-07-27 12:01:20 +00:00
Sandro Jäckel 02732ba0a4
xorg-rgb: format, cleanup 2021-07-27 09:46:18 +02:00
github-actions[bot] d01381167a
Merge master into staging-next 2021-07-26 18:01:17 +00:00
sternenseemann 7620da89f6 all-cabal-hashes: 2021-07-21T05:42:12Z -> 2021-07-26T15:54:23Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-07-26 18:19:53 +02:00
R. RyanTM d952953b85 mailcap: 2.1.52 -> 2.1.53 2021-07-24 15:31:35 +02:00
(cdep)illabout 96e6ee3ea9
all-cabal-hashes: 2021-07-17T11:52:29Z -> 2021-07-21T05:42:12Z 
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
 2021-07-21 13:55:09 +09:00