Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d73f16d6767e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 803e956919ef
Choose a head ref

Commits on Feb 19, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    Copy the full SHA
    c460176 View commit details

Commits on Mar 11, 2019

  1. python37Packages.pyshp: 2.0.1 -> 2.1.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-pyshp/versions
    r-ryantm committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    Copy the full SHA
    eda8c04 View commit details
  2. Switch homepage for turses to louipc fork

    The original repo is gone.
    booxter committed Mar 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    Copy the full SHA
    c59d2d3 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    stigtsp Stig
    Copy the full SHA
    6f525a5 View commit details

Commits on Mar 16, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    minijackson Rémi NICOLE
    Copy the full SHA
    268f159 View commit details

Commits on Mar 25, 2019

  1. broot: 0.7.2 -> 0.7.4

    dywedir committed Mar 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    167eb23 View commit details

Commits on Mar 26, 2019

  1. Merge pull request #55898 from xtruder/pkgs/rootlesskit/init

    feat(roolesskit): init at 0.3.0-alpha.2
    offlinehacker authored Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0a06afa View commit details
  2. python37Packages.shellingham: 1.2.8 -> 1.3.0 (#57456)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-shellingham/versions
    r-ryantm authored and dotlambda committed Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    d0d43fb View commit details
  3. python37Packages.shodan: 1.10.4 -> 1.11.1 (#57457)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-shodan/versions
    r-ryantm authored and dotlambda committed Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Flakebi Sebastian Neubauer
    Copy the full SHA
    b71c15b View commit details
  4. python37Packages.Quandl: 3.4.5 -> 3.4.6 (#57447)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-quandl/versions
    r-ryantm authored and dotlambda committed Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2d14a88 View commit details
  5. Verified

    This commit was signed with the committer’s verified signature.
    Flakebi Sebastian Neubauer
    Copy the full SHA
    ef48aaf View commit details
  6. Merge pull request #57818 from illegalprime/fix/gnupg-cross

    gnupg: use config flags to find lib prefix instead of their binary tools
    peti authored Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Flakebi Sebastian Neubauer
    Copy the full SHA
    98dcfed View commit details
  7. dune: move into ocamlPackages

    vbgl committed Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Flakebi Sebastian Neubauer
    Copy the full SHA
    7a2426c View commit details
  8. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    stigtsp Stig
    Copy the full SHA
    f56d52b View commit details
  9. Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    Copy the full SHA
    6a45d87 View commit details
  10. pythonPackages.isort: 4.3.4 -> 4.3.16

    We set $TMPDIR, because isort refuses to run in paths containing
    'build' (since that is part of Python's typical build infrastructure).
    kwohlfahrt committed Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    f61ed7f View commit details
  11. python.pkgs.cssselect2: no isort etc. tests

    The isort tests were broken after upgrading the isort package.
    Robert Schütz committed Mar 26, 2019
    Copy the full SHA
    6dac4d5 View commit details
  12. Merge pull request #56884 from kwohlfahrt/isort

    pythonPackages.isort: 4.3.4 -> 4.3.15
    dotlambda authored Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4ad9324 View commit details
  13. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    Copy the full SHA
    853b589 View commit details
  14. Merge pull request #57461 from booxter/turses

    turses: fix crash when starting with existing config file
    matthewbauer authored Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    Copy the full SHA
    2a3167c View commit details
  15. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    Copy the full SHA
    29cec94 View commit details
  16. python37Packages.pyshp: 2.0.1 -> 2.1.0 (#57442)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-pyshp/versions
    dotlambda authored Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d1bdc54 View commit details
  17. Merge pull request #58300 from dywedir/broot

    broot: 0.7.2 -> 0.7.4
    dtzWill authored Mar 26, 2019
    Copy the full SHA
    e2d96d3 View commit details
  18. LTS Haskell 13.14

    peti committed Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3732f1f View commit details
  19. hackage-packages.nix: automatic Haskell package set update

    This update was generated by hackage2nix v2.14.2-4-gd25a3c5 from Hackage revision
    commercialhaskell/all-cabal-hashes@12f5245.
    peti committed Mar 26, 2019
    Copy the full SHA
    999450f View commit details
  20. Copy the full SHA
    803e956 View commit details
13 changes: 10 additions & 3 deletions pkgs/applications/networking/instant-messengers/turses/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, python36Packages }:
{ stdenv, fetchpatch, python36Packages }:

with stdenv.lib;

@@ -19,14 +19,21 @@ buildPythonPackage rec {
checkInputs = [ mock pytest coverage tox ];
propagatedBuildInputs = [ urwid tweepy future ];

patches = [
(fetchpatch {
url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch";
sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3";
})
];

checkPhase = ''
TMP_TURSES=`echo turses-$RANDOM`
mkdir $TMP_TURSES
PYTHONPATH=tests:$PYTHONPATH HOME=$TMP_TURSES py.test tests/
rm -rf $TMP_TURSES
'';

patchPhase = ''
postPatch = ''
sed -i -e 's|urwid==1.3.0|urwid==${getVersion urwid}|' setup.py
sed -i -e "s|future==0.14.3|future==${getVersion future}|" setup.py
sed -i -e "s|tweepy==3.3.0|tweepy==${getVersion tweepy}|" setup.py
@@ -35,7 +42,7 @@ buildPythonPackage rec {
'';

meta = with stdenv.lib; {
homepage = https://github.com/alejandrogomez/turses;
homepage = https://github.com/louipc/turses;
description = "A Twitter client for the console";
license = licenses.gpl3;
maintainers = with maintainers; [ garbas ];
21 changes: 21 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
Original file line number Diff line number Diff line change
@@ -67,4 +67,25 @@ self: super: {
# Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
stack = doJailbreak super.stack;

# Needs a recent version from the "develop" branch of the upstream git
# repository to compile with ghc 8.6.4.
liquid-fixpoint = assert super.liquid-fixpoint.version == "0.7.0.7"; overrideSrc super.liquid-fixpoint {
src = pkgs.fetchFromGitHub {
owner = "ucsd-progsys";
repo = "liquid-fixpoint";
rev = "42c027ab9ae47907c588a2f1f9c05a5e0aa881e9";
sha256 = "17qmzq1vx7h04yd38drr6sh6hys3q2rz62qh3pna9kbxlcnikkqf";
};
version = "0.8.0.2-pre-release";
};
liquidhaskell = assert super.liquidhaskell.version == "0.8.2.4"; overrideSrc super.liquidhaskell {
src = pkgs.fetchFromGitHub {
owner = "ucsd-progsys";
repo = "liquidhaskell";
rev = "254e77da9cd36e95b72c526bfb9eec50d3447050";
sha256 = "089x41z51iw542ijz32j9ns6flcc4hsbjqx7rfznvmm7a4q78yza";
};
version = "0.8.6.0-pre-release";
};

}
36 changes: 19 additions & 17 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ default-package-overrides:
# Newer versions don't work in LTS-12.x
- alsa-mixer < 0.3
- cassava-megaparsec < 2
# LTS Haskell 13.13
# LTS Haskell 13.14
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -263,6 +263,7 @@ default-package-overrides:
- bazel-runfiles ==0.7.0.1
- bbdb ==0.8
- bcrypt ==0.0.11
- beam-core ==0.8.0.0
- bench ==1.0.12
- benchpress ==0.2.2.12
- bencode ==0.6.0.0
@@ -386,7 +387,7 @@ default-package-overrides:
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
- check-email ==1.0.2
- checkers ==0.4.11
- checkers ==0.4.14
- checksum ==0.0
- choice ==0.2.2
- chronologique ==0.3.1.1
@@ -600,7 +601,7 @@ default-package-overrides:
- direct-sqlite ==2.3.24
- discount ==0.1.1
- disk-free-space ==0.1.0.1
- distributed-closure ==0.4.1
- distributed-closure ==0.4.1.1
- distribution-opensuse ==1.1.1
- distributive ==0.6
- dlist ==0.8.0.5
@@ -743,7 +744,7 @@ default-package-overrides:
- fmt ==0.6.1.1
- fn ==0.3.0.2
- focus ==1.0.1.2
- focuslist ==0.1.0.1
- focuslist ==0.1.0.2
- foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.8
- fold-debounce-conduit ==0.2.0.3
@@ -1034,7 +1035,7 @@ default-package-overrides:
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
- http2 ==1.6.4
- HTTP ==4000.3.12
- HTTP ==4000.3.13
- http-api-data ==0.4
- http-client ==0.5.14
- http-client-tls ==0.3.5.3
@@ -1134,7 +1135,7 @@ default-package-overrides:
- io-storage ==0.3
- io-streams ==1.5.1.0
- io-streams-haproxy ==1.0.1.0
- ip ==1.4.2
- ip ==1.4.2.1
- ip6addr ==1.0.0
- iproute ==1.7.7
- IPv6Addr ==1.1.2
@@ -1153,6 +1154,7 @@ default-package-overrides:
- jack ==0.7.1.4
- jose ==0.8.0.0
- jose-jwt ==0.8.0
- js-dgtable ==0.5.2
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json ==0.9.3
@@ -1188,7 +1190,7 @@ default-package-overrides:
- lame ==0.1.1
- language-c ==0.8.2
- language-c-quote ==0.12.2
- language-docker ==8.0.1
- language-docker ==8.0.2
- language-ecmascript ==0.19
- language-haskell-extract ==0.2.4
- language-java ==0.2.9
@@ -1268,7 +1270,7 @@ default-package-overrides:
- machines-directory ==0.2.1.0
- machines-io ==0.2.0.13
- mainland-pretty ==0.7
- main-tester ==0.2.0.0
- main-tester ==0.2.0.1
- makefile ==1.1.0.0
- managed ==1.0.6
- mapquest-api ==0.3.1
@@ -1294,7 +1296,7 @@ default-package-overrides:
- mega-sdist ==0.3.3.2
- memory ==0.14.18
- MemoTrie ==0.6.9
- menshen ==0.0.1
- menshen ==0.0.2
- mercury-api ==0.1.0.2
- merkle-tree ==0.1.1
- mersenne-random-pure64 ==0.2.2.0
@@ -1401,7 +1403,7 @@ default-package-overrides:
- ndjson-conduit ==0.1.0.5
- neat-interpolation ==0.3.2.4
- netlib-ffi ==0.1.1
- netpbm ==1.0.2
- netpbm ==1.0.3
- netrc ==0.2.0.0
- nettle ==0.3.0
- netwire ==5.0.3
@@ -1840,7 +1842,7 @@ default-package-overrides:
- siggy-chardust ==1.0.0
- signal ==0.1.0.4
- silently ==1.2.5
- simple-cmd ==0.1.3
- simple-cmd ==0.1.3.1
- simple-cmd-args ==0.1.0.1
- simple-log ==0.9.11
- simple-reflect ==0.3.3
@@ -2050,7 +2052,7 @@ default-package-overrides:
- th-strict-compat ==0.1.0.1
- th-utilities ==0.2.1.0
- thyme ==0.3.5.5
- tidal ==1.0.8
- tidal ==1.0.10
- tile ==0.3.0.0
- time-compat ==0.1.0.3
- timeit ==2.0
@@ -2154,7 +2156,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- util ==0.1.12.0
- util ==0.1.13.0
- utility-ht ==0.0.14
- uuid ==1.3.13
- uuid-types ==1.0.3
@@ -2231,7 +2233,7 @@ default-package-overrides:
- webrtc-vad ==0.1.0.3
- websockets ==0.12.5.3
- websockets-snap ==0.10.3.0
- weigh ==0.0.13
- weigh ==0.0.14
- wide-word ==0.1.0.8
- wikicfp-scraper ==0.1.0.10
- wild-bind ==0.1.2.3
@@ -2304,7 +2306,7 @@ default-package-overrides:
- yesod-auth-hashdb ==1.7.1
- yesod-auth-oauth2 ==0.6.1.1
- yesod-bin ==1.6.0.3
- yesod-core ==1.6.12
- yesod-core ==1.6.13
- yesod-csp ==0.2.4.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
@@ -2429,6 +2431,8 @@ package-maintainers:
- lambdabot-core
- lambdabot-irc-plugins
- language-nix
- liquid-fixpoint
- liquidhaskell
- logging-facade-syslog
- nix-paths
- pandoc
@@ -6568,8 +6572,6 @@ broken-packages:
- lio-simple
- lipsum-gen
- liquid
- liquid-fixpoint
- liquidhaskell
- liquidhaskell-cabal
- liquidhaskell-cabal-demo
- list-fusion-probe
Loading