ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-05 00:38:04 +00:00 committed by GitHub
commit acbe77678e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 1329 additions and 1025 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/strings.nix
View File

@ -593,9 +593,9 @@ rec {
standard GNU Autoconf scripts.
Example:
with_Feature true "shared" "foo"
withFeatureAs true "shared" "foo"
=> "--with-shared=foo"
with_Feature false "shared" (throw "ignored")
withFeatureAs false "shared" (throw "ignored")
=> "--without-shared"
*/
withFeatureAs = with_: feat: value: withFeature with_ feat + optionalString with_ "=${value}";

53
pkgs/applications/audio/mympd/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ stdenv
, fetchFromGitHub
, cmake
, pkg-config
, mpd_clientlib
, openssl
, lua5_3
, libid3tag
, flac
, mongoose
}:
stdenv.mkDerivation rec {
pname = "mympd";
version = "6.8.1";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${version}";
sha256 = "dIGg2mLxN6XBDH3GFXtF7nB9a/zf/qMlPCvIulFRXn8=";
};
nativeBuildInputs = [
pkg-config
cmake
];
buildInputs = [
mpd_clientlib
openssl
lua5_3
libid3tag
flac
];
cmakeFlags = [
"-DENABLE_LUA=ON"
# Otherwise, it tries to parse $out/etc/mympd.conf on startup.
"-DCMAKE_INSTALL_SYSCONFDIR=/etc"
# similarly here
"-DCMAKE_INSTALL_LOCALSTATEDIR=/var/lib/mympd"
];
# See https://github.com/jcorporation/myMPD/issues/315
hardeningDisable = [ "strictoverflow" ];
meta = {
homepage = "https://jcorporation.github.io/mympd";
description = "A standalone and mobile friendly web mpd client with a tiny footprint and advanced features";
maintainers = [ stdenv.lib.maintainers.doronbehar ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2Plus;
};
}

18
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -18,22 +18,22 @@
}
},
"beta": {
"version": "87.0.4280.66",
"sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19",
"sha256bin64": "15n01jia8sxv3a7vfbla40rq45x54pyksg0kg14bm0br6m3n65pz",
"version": "88.0.4324.27",
"sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc",
"sha256bin64": "0qf2j1j3p94s724rwh8fydpjn88cs9yxxhjf5axvqwi7q3h35cfx",
"deps": {
"gn": {
"version": "2020-09-09",
"version": "2020-11-05",
"url": "https://gn.googlesource.com/gn",
"rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
"sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
"rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
"sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
}
}
},
"dev": {
"version": "88.0.4324.27",
"sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc",
"sha256bin64": "0ax27j42167yyx90h5k6ra898kn626w5cvgmafm3al9kyfsx36m4",
"version": "89.0.4343.0",
"sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa",
"sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d",
"deps": {
"gn": {
"version": "2020-11-05",

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/59ba02b3424684458764210fa9e32ca08e516db2.tar.gz";
sha256 = "0m4scz6b7xg7kisy6zlnw258pkfksmzzppw9gp0g6rdl0cxly239";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a82d2463451cfd47772b3fb331b1a0e8386675ef.tar.gz";
sha256 = "0l2h2z0982nmw3kq9r6ppwgs7ar4bda9c808mc2nkcyfmcnkdl6w";
}

9
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -38,11 +38,6 @@ self: super: {
ghcjs-base = null;
ghcjs-prim = null;
# Some packages add this (non-existent) dependency to express that they
# cannot compile in a given configuration. Win32 does this, for example, when
# compiled on Linux. We provide the name to avoid evaluation errors.
unbuildable = throw "package depends on meta package 'unbuildable'";
# enable using a local hoogle with extra packagages in the database
# nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
# $ hoogle server
@ -327,6 +322,7 @@ self: super: {
http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
ihaskell = dontCheck super.ihaskell;
influxdb = dontCheck super.influxdb;
integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0
itanium-abi = dontCheck super.itanium-abi;
katt = dontCheck super.katt;
language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275
@ -442,9 +438,6 @@ self: super: {
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6
# Should not appear in nixpkgs yet (broken anyway)
yarn2nix = throw "yarn2nix is not yet packaged for nixpkgs. See https://github.com/Profpatsch/yarn2nix#yarn2nix";
# no haddock since this is an umbrella package.
cloud-haskell = dontHaddock super.cloud-haskell;

417
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

File diff suppressed because it is too large Load Diff

3
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -830,4 +830,7 @@ self: super: builtins.intersectAttrs super {
export HOME=$TMPDIR
'';
});
# tests depend on a specific version of solc
hevm = dontCheck (doJailbreak super.hevm);
}

1693
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

3
pkgs/development/haskell-modules/non-hackage-packages.nix
View File

@ -7,9 +7,6 @@
# files.
self: super: {
multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed"
+ " to haskell-ci, which is now on hackage");
dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { };
# https://github.com/channable/vaultenv/issues/1

4
pkgs/development/libraries/liblouis/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "liblouis";
version = "3.15.0";
version = "3.16.1";
src = fetchFromGitHub {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
sha256 = "1ljy5xsy7vf2r0ix0d7bqcr6qvr6897f8madsx9zlm1mrj31n5px";
sha256 = "0q9ixy8cjgd2d2lzxgkfd4chzr5j1bz783mg10pnwviyg6k630m5";
};
outputs = [ "out" "dev" "man" "info" "doc" ];

4
pkgs/development/ocaml-modules/mirage/runtime.nix
View File

@ -3,7 +3,7 @@
buildDunePackage rec {
pname = "mirage-runtime";
version = "3.10.0";
version = "3.10.1";
useDune2 = true;
@ -11,7 +11,7 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz";
sha256 = "01nq358bilsvvwrvyavc5gik1csjljn4rb3k8yx94gxvbj5vx4h2";
sha256 = "1glmsz2znhfkk4w6d6nsr7q5jqvivhmi8zwagzw2d8pah0c8bhm4";
};
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ];

4
pkgs/development/ocaml-modules/tls/default.nix
View File

@ -6,12 +6,12 @@
buildDunePackage rec {
minimumOCamlVersion = "4.08";
version = "0.12.6";
version = "0.12.7";
pname = "tls";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
sha256 = "14b2289nhb65qm8wrw51y8qgz5ysn8hcbrj5plznd1pdzl46zxc9";
sha256 = "1c7hmcpcxn1bfa9cavqzriv7py2q7xfbdpb7kh1kb3j1qjap17dc";
};
useDune2 = true;

6
pkgs/development/tools/kubie/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
sha256 = "0862f582i08h80pm6igmi00qsacl5b9jaahh50l2i3905k7rxf5s";
sha256 = "0q21qd9fhchggby18gzyvds517n9vq7b1rr0gmzik4036ykg1lm2";
};
cargoSha256 = "1b0nl4nwjza52madrfsmwivxxvz18b53kynv2fbsbh3zzbrm5fj1";
cargoSha256 = "0dp4prv8c2a6mxl7wskpc65qlfjphdxshb4q2bswqa5i21h8r534";
nativeBuildInputs = [ installShellFiles ];

16
pkgs/games/factorio/versions.json
View File

@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.4.tar.xz",
"name": "factorio_alpha_x64-1.1.5.tar.xz",
"needsAuth": true,
"sha256": "0gg10pk0qb44iizwvlzndjr2xkygqzaxmhp9bam7gz86b5cxs0cl",
"sha256": "17hm62mhldms41wv0vv2bzg8zg1mg7ga61h3yzw9dfvic661khmp",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.4/alpha/linux64",
"version": "1.1.4"
"url": "https://factorio.com/get-download/1.1.5/alpha/linux64",
"version": "1.1.5"
},
"stable": {
"name": "factorio_alpha_x64-1.0.0.tar.xz",
@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.4.tar.xz",
"name": "factorio_headless_x64-1.1.5.tar.xz",
"needsAuth": false,
"sha256": "085lpblysh126y38z01f358xcpwmx1a6hcjlc66aw5ff6bp36yq8",
"sha256": "1s4ajj8kkz1q5rivv2q6c8ii73nxa11g4fs6hic3r43l52n89ml1",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.4/headless/linux64",
"version": "1.1.4"
"url": "https://factorio.com/get-download/1.1.5/headless/linux64",
"version": "1.1.5"
},
"stable": {
"name": "factorio_headless_x64-1.0.0.tar.xz",

4
pkgs/games/osu-lazer/default.nix
View File

@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
version = "2020.1128.0";
version = "2020.1204.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "0qf1lvzd668zd405ll3bdbk91xdyr2l9qg42ph93vjcnmrs2jqic";
sha256 = "1yr9rkkmm15lgbfbrvpyp0d66i5v2xs39abw8yv6qlf70qh4bsg5";
};
patches = [ ./bypass-tamper-detection.patch ];

79
pkgs/games/osu-lazer/deps.nix generated
View File

@ -1,8 +1,8 @@
{ fetchNuGet }: [
(fetchNuGet {
name = "Dapper";
version = "2.0.35";
sha256 = "0465i2p5kjj0hmadyw0xrpn43zpc4bnbid9mg561739fyjyjwmfm";
version = "2.0.78";
sha256 = "13xgi8prsa3y67hx644yflamwakjv8vsk5m15v407clsl2r4g0bp";
})
(fetchNuGet {
name = "DeltaCompressionDotNet";
@ -16,8 +16,8 @@
})
(fetchNuGet {
name = "DiscordRichPresence";
version = "1.0.150";
sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79";
version = "1.0.166";
sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a";
})
(fetchNuGet {
name = "FFmpeg.AutoGen";
@ -261,8 +261,8 @@
})
(fetchNuGet {
name = "JetBrains.Annotations";
version = "2020.1.0";
sha256 = "13fqcr6bs4x9rn0mpx110xl5apwh8ds1h0lx208znrm178ywqm8y";
version = "2020.3.0";
sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2";
})
(fetchNuGet {
name = "ManagedBass";
@ -574,11 +574,6 @@
version = "3.1.9";
sha256 = "0538fvjz9c27nvc6kv83b0912qvc71wz2w60svl0mscj86ds49wc";
})
(fetchNuGet {
name = "Microsoft.Net.Compilers.Toolset";
version = "3.1.0";
sha256 = "1csf8hgwvyxjlxdygacrk3pp0xkzydc1kvsv68cxy8h7gd62k0w0";
})
(fetchNuGet {
name = "Microsoft.NetCore.Analyzers";
version = "3.3.1";
@ -601,13 +596,13 @@
})
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
version = "3.1.0";
sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j";
version = "3.1.1";
sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987";
})
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
version = "3.1.1";
sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987";
version = "5.0.0";
sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc";
})
(fetchNuGet {
name = "Microsoft.NETCore.Targets";
@ -636,8 +631,8 @@
})
(fetchNuGet {
name = "Microsoft.Win32.Registry";
version = "4.7.0";
sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs";
version = "5.0.0";
sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n";
})
(fetchNuGet {
name = "Mono.Cecil";
@ -681,8 +676,8 @@
})
(fetchNuGet {
name = "ppy.osu.Framework";
version = "2020.1127.0";
sha256 = "05vxdkw5z7bylj8dyw52lxf3g12mmvdifwvwlgz00v6ybkxr455j";
version = "2020.1203.0";
sha256 = "0xk1l09gm39z1739a7bgykj2bkg6lgxx72ds9s7qmbc6nrkr7jwj";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@ -691,8 +686,8 @@
})
(fetchNuGet {
name = "ppy.osu.Game.Resources";
version = "2020.1030.0";
sha256 = "1sxip1m5y7c5jblf9br8f0i5yhv0qjpidv9w6bbdxiy29mfwnz6d";
version = "2020.1202.0";
sha256 = "1m5156gkyyhf52ii6y7yqmsgpwcxn6zgji3nnyny6lk9glmc9vvs";
})
(fetchNuGet {
name = "ppy.osuTK.NS20";
@ -701,8 +696,8 @@
})
(fetchNuGet {
name = "ppy.SDL2-CS";
version = "1.0.40";
sha256 = "1pvc154nqdbhn0rm6id0710yh72wvd2s5xmqxx3935h1jxrjgk8s";
version = "1.0.53";
sha256 = "0x52pq6xdg4qcgi8cnqlijifqjpszbi8z4nkmsym0xgd9m5bmd7k";
})
(fetchNuGet {
name = "ppy.squirrel.windows";
@ -816,8 +811,8 @@
})
(fetchNuGet {
name = "Sentry";
version = "2.1.6";
sha256 = "0vc45p1arxwifv5fb6lzkqqxlsvm4i0xmpq2vc73vbjqzydd2phm";
version = "2.1.8";
sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn";
})
(fetchNuGet {
name = "Sentry.PlatformAbstractions";
@ -826,8 +821,8 @@
})
(fetchNuGet {
name = "Sentry.Protocol";
version = "2.1.6";
sha256 = "0qc18kc9d7f0s6hmnpji3sbz0z09kdgg4fwh55rrmpfgr3w851s7";
version = "2.1.8";
sha256 = "04baw4yxc5lbcl83sfcdyjg5225719bf3sxpa3kjmhf58bjr143l";
})
(fetchNuGet {
name = "SharpCompress";
@ -844,15 +839,10 @@
version = "2.0.0";
sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0";
})
(fetchNuGet {
name = "SixLabors.Core";
version = "1.0.0-beta0008";
sha256 = "1yqcv5d2igsrmi9hf8xzikn0fms47skqpr552yzbj4z4wnraahaw";
})
(fetchNuGet {
name = "SixLabors.ImageSharp";
version = "1.0.0-beta0007";
sha256 = "1k3hrp26imyqjarkrcsrhvamlmynzv6cakzq68yx69c0h8lmscaf";
version = "1.0.2";
sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj";
})
(fetchNuGet {
name = "Splat";
@ -919,11 +909,6 @@
version = "4.4.0";
sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19";
})
(fetchNuGet {
name = "System.Buffers";
version = "4.5.0";
sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c";
})
(fetchNuGet {
name = "System.Buffers";
version = "4.5.1";
@ -971,8 +956,8 @@
})
(fetchNuGet {
name = "System.ComponentModel.Annotations";
version = "4.7.0";
sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z";
version = "5.0.0";
sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j";
})
(fetchNuGet {
name = "System.Composition";
@ -1151,8 +1136,8 @@
})
(fetchNuGet {
name = "System.IO.Packaging";
version = "4.7.0";
sha256 = "1vivvf158ilcpp6bq70zyafimi0lng546b34csmjb09k19wgxpiv";
version = "5.0.0";
sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n";
})
(fetchNuGet {
name = "System.IO.Pipelines";
@ -1436,8 +1421,8 @@
})
(fetchNuGet {
name = "System.Security.AccessControl";
version = "4.7.0";
sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz";
version = "5.0.0";
sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r";
})
(fetchNuGet {
name = "System.Security.Cryptography.Algorithms";
@ -1511,8 +1496,8 @@
})
(fetchNuGet {
name = "System.Security.Principal.Windows";
version = "4.7.0";
sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d";
version = "5.0.0";
sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8";
})
(fetchNuGet {
name = "System.Text.Encoding";

4
pkgs/servers/mail/postsrsd/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "postsrsd";
version = "1.7";
version = "1.8";
src = fetchFromGitHub {
owner = "roehling";
repo = "postsrsd";
rev = version;
sha256 = "11yr557m60a62m4wxi20lr8kmagjrgndmnwlxzr241bwb20ba96x";
sha256 = "1f10ac7bkphvjjh2xzzz5c0x97njx20yd8wvl99isqfsyyc2lhm7";
};
cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ];

4
pkgs/servers/misc/navidrome/default.nix
View File

@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "navidrome";
version = "0.38.0";
version = "0.39.0";
src = fetchurl {
url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
sha256 = "01fkzsvdz1b43m8glxl01vw7d19w5fglk9x1rj5bab8fgrx149w8";
sha256 = "0ngqlb9d8xml0vnjsn6vpi02sjqldsiirlrzfncrh3hlcrhk4fcn";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/servers/x11/xorg/default.nix
View File

@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
name = "xorg-server-1.20.9";
name = "xorg-server-1.20.10";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2";
sha256 = "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2";
url = "mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2";
sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];

10
pkgs/servers/x11/xorg/overrides.nix
View File

@ -630,16 +630,6 @@ self: super:
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
udev
];
# patchPhase is not working, this is a hack but we can remove it in the next xorg-server release
preConfigure = let
# https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
headerFix = fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/919f1f46fc67dae93b2b3f278fcbfc77af34ec58.patch";
sha256 = "0w48rdpl01v0c97n9zdxhf929y76r1f6rqkfs9mfygkz3xcmrfsq";
};
in ''
patch -p1 < ${headerFix}
'';
prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
'';

2
pkgs/servers/x11/xorg/tarballs.list
View File

@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2

4
pkgs/tools/system/nvtop/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nvtop";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "Syllo";
repo = "nvtop";
rev = version;
sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4";
sha256 = "1h24ppdz7l6l0znwbgir49f7r1fshzjavc6i5j33c6bvr318dpqb";
};
cmakeFlags = [

3
pkgs/top-level/all-packages.nix
View File

@ -22683,6 +22683,9 @@ in
ympd = callPackage ../applications/audio/ympd { };
# a somewhat more maintained fork of ympd
mympd = callPackage ../applications/audio/mympd { };
nload = callPackage ../applications/networking/nload { };
normalize = callPackage ../applications/audio/normalize { };